mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00
Code Issues Releases Wiki Activity

[ticket/17493] Remove settings, values, and lang vars for jabber

Browse Source 
PHPBB-17493
This commit is contained in:
Marc Alexander
2025-04-13 20:48:15 +02:00
parent e32ebda982
commit a7c7c38bfb
21 changed files with 11 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/includes/ucp/ucp_profile.php
View File

@@ -284,9 +284,7 @@ class ucp_profile
$cp_data = $cp_error = array();
$data = array(
'jabber' => $request->variable('jabber', $user->data['user_jabber'], true),
);
$data = [];
if ($config['allow_birthdays'])
{
@@ -318,11 +316,7 @@ class ucp_profile
if ($submit)
{
$validate_array = array(
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
);
$validate_array = [];
if ($config['allow_birthdays'])
{
@@ -363,18 +357,8 @@ class ucp_profile
if (!count($error))
{
$data['notify'] = $user->data['user_notify_type'];
if ($data['notify'] == messenger_interface::NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml')))
{
// User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled)
// Disable notify by Jabber now for this user.
$data['notify'] = messenger_interface::NOTIFY_EMAIL;
}
$sql_ary = array(
'user_jabber' => $data['jabber'],
'user_notify_type' => $data['notify'],
'user_notify_type' => messenger_interface::NOTIFY_EMAIL,
);
if ($config['allow_birthdays'])
@@ -446,8 +430,6 @@ class ucp_profile
$template->assign_vars(array(
'ERROR' => (count($error)) ? implode('<br />', $error) : '',
'S_JABBER_ENABLED' => $config['jab_enable'],
'JABBER' => $data['jabber'],
));
// Get additional profile fields and assign them to the template block var 'profile_fields'