makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't attempt to change the password unless jabber is enabled ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4594 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-10-13 17:41:00 +00:00
parent bb9cd0f2ba
commit 79469f244f
1 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/adm/admin_jabber.php
View file

@ -61,8 +61,10 @@ $jabber->resource = $jab_resource;
// Are changing (or initialising) a new host or username? If so run some checks and // Are changing (or initialising) a new host or username? If so run some checks and
// try to create account if it doesn't exist // 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()) if (!$jabber->Connect())
{ {
trigger_error('Could not connect to Jabber server', E_USER_ERROR); 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); sleep(1);
$jabber->Disconnect(); $jabber->Disconnect();
} }
else if ($jab_password != $config['jab_password']) else if ($jab_password != $config['jab_password'])
{ {
if (!$jabber->Connect()) if (!$jabber->Connect())
{ {
trigger_error('Could not connect to Jabber server', E_USER_ERROR); trigger_error('Could not connect to Jabber server', E_USER_ERROR);
@ -117,6 +119,7 @@ else if ($jab_password != $config['jab_password'])
sleep(1); sleep(1);
$jabber->Disconnect(); $jabber->Disconnect();
}
} }
// Pull relevant config data // Pull relevant config data