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

- Bug 1177

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5681 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-03-21 23:29:54 +00:00
parent 6e80318f89
commit 0818b471e6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/acp/acp_jabber.php
View file

@ -62,16 +62,16 @@ class acp_jabber
{ {
if ($jab_host != $config['jab_host'] || $jab_username != $config['jab_username']) 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' . adm_back_link($this->u_action)); trigger_error('Could not connect to Jabber server' . adm_back_link($this->u_action));
} }
// First we'll try to authorise using this account, if that fails we'll // First we'll try to authorise using this account, if that fails we'll
// try to create it. // try to create it.
if (!($result = $jabber->SendAuth())) if (!($result = $jabber->send_auth()))
{ {
if (($result = $jabber->AccountRegistration($config['board_email'], $config['sitename'])) <> 2) if (($result = $jabber->account_registration($config['board_email'], $config['sitename'])) <> 2)
{ {
$error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result); $error[] = ($result == 1) ? $user->lang['ERR_JAB_USERNAME'] : sprintf($user->lang['ERR_JAB_REGISTER'], $result);
} }
@ -88,22 +88,22 @@ class acp_jabber
} }
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' . adm_back_link($this->u_action)); trigger_error('Could not connect to Jabber server' . adm_back_link($this->u_action));
} }
if (!$jabber->SendAuth()) if (!$jabber->send_auth())
{ {
trigger_error('Could not authorise on Jabber server' . adm_back_link($this->u_action)); trigger_error('Could not authorise on Jabber server' . adm_back_link($this->u_action));
} }
$jabber->SendPresence(NULL, NULL, 'online'); $jabber->send_presence(NULL, NULL, 'online');
if (($result = $jabber->ChangePassword($jab_password)) <> 2) if (($result = $jabber->change_password($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);
} }
@ -114,7 +114,7 @@ class acp_jabber
} }
sleep(1); sleep(1);
$jabber->Disconnect(); $jabber->disconnect();
} }
} }