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

89
phpBB/adm/admin_jabber.php
View file

@ -61,62 +61,65 @@ $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 (!$jabber->Connect()) if($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']))
{ {
trigger_error('Could not connect to Jabber server', E_USER_ERROR); if (!$jabber->Connect())
}
// First we'll try to authorise using this account, if that fails we'll
// try to create it.
if (!($result = $jabber->SendAuth()))
{
if (($result = $jabber->AccountRegistration($config['board_email'], $config['sitename'])) <> 2)
{ {
trigger_error('Could not connect to Jabber server', E_USER_ERROR);
}
$error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result); // First we'll try to authorise using this account, if that fails we'll
// try to create it.
if (!($result = $jabber->SendAuth()))
{
if (($result = $jabber->AccountRegistration($config['board_email'], $config['sitename'])) <> 2)
{
$error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result);
}
else
{
$message = $user->lang['JAB_REGISTERED'];
$log = 'JAB_REGISTER';
}
} }
else else
{ {
$message = $user->lang['JAB_REGISTERED']; $message = $user->lang['JAB_CHANGED'];
$log = 'JAB_REGISTER'; $log = 'JAB_CHANGED';
} }
}
else
{
$message = $user->lang['JAB_CHANGED'];
$log = 'JAB_CHANGED';
}
sleep(1); sleep(1);
$jabber->Disconnect(); $jabber->Disconnect();
}
else if ($jab_password != $config['jab_password'])
{
if (!$jabber->Connect())
{
trigger_error('Could not connect to Jabber server', E_USER_ERROR);
} }
else if ($jab_password != $config['jab_password'])
{
if (!$jabber->Connect())
{
trigger_error('Could not connect to Jabber server', E_USER_ERROR);
}
if (!$jabber->SendAuth()) if (!$jabber->SendAuth())
{ {
trigger_error('Could not authorise on Jabber server', E_USER_ERROR); trigger_error('Could not authorise on Jabber server', E_USER_ERROR);
} }
$jabber->SendPresence(NULL, NULL, 'online'); $jabber->SendPresence(NULL, NULL, 'online');
if (($result = $jabber->ChangePassword($jab_password)) <> 2) if (($result = $jabber->ChangePassword($jab_password)) <> 2)
{ {
$error[] = ($result == 1) ? $user->lang['ERR_JAB_PASSCHG'] : sprintf($user->lang['ERR_JAB_PASSFAIL'], $result); $error[] = ($result == 1) ? $user->lang['ERR_JAB_PASSCHG'] : sprintf($user->lang['ERR_JAB_PASSFAIL'], $result);
} }
else else
{ {
$message = $user->lang['JAB_PASS_CHANGED']; $message = $user->lang['JAB_PASS_CHANGED'];
$log = 'JAB_PASSCHG'; $log = 'JAB_PASSCHG';
} }
sleep(1); sleep(1);
$jabber->Disconnect(); $jabber->Disconnect();
}
} }
// Pull relevant config data // Pull relevant config data