mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 00:07:44 +02:00
Don't attempt to change the password unless jabber is enabled ...
git-svn-id: file:///svn/phpbb/trunk@4594 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -61,8 +61,10 @@ $jabber->resource = $jab_resource;
|
||||
|
||||
// Are changing (or initialising) a new host or username? If so run some checks and
|
||||
// try to create account if it doesn't exist
|
||||
if ($jab_enable && ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']))
|
||||
if ($jab_enable)
|
||||
{
|
||||
if($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']))
|
||||
{
|
||||
if (!$jabber->Connect())
|
||||
{
|
||||
trigger_error('Could not connect to Jabber server', E_USER_ERROR);
|
||||
@@ -91,9 +93,9 @@ if ($jab_enable && ($jab_host != $config['jab_host'] || $jab_username != $config
|
||||
|
||||
sleep(1);
|
||||
$jabber->Disconnect();
|
||||
}
|
||||
else if ($jab_password != $config['jab_password'])
|
||||
{
|
||||
}
|
||||
else if ($jab_password != $config['jab_password'])
|
||||
{
|
||||
if (!$jabber->Connect())
|
||||
{
|
||||
trigger_error('Could not connect to Jabber server', E_USER_ERROR);
|
||||
@@ -117,6 +119,7 @@ else if ($jab_password != $config['jab_password'])
|
||||
|
||||
sleep(1);
|
||||
$jabber->Disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Pull relevant config data
|
||||
|
Reference in New Issue
Block a user