diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-03-21 23:29:54 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-03-21 23:29:54 +0000 |
| commit | 0818b471e6f4d518e2e6d04964105f3dec6e9c84 (patch) | |
| tree | d4a77b25c6c8a24435df81abdc4596dcfa4cc82c | |
| parent | 6e80318f89f0611c70466249869fa8fdc940c71d (diff) | |
| download | forums-0818b471e6f4d518e2e6d04964105f3dec6e9c84.tar forums-0818b471e6f4d518e2e6d04964105f3dec6e9c84.tar.gz forums-0818b471e6f4d518e2e6d04964105f3dec6e9c84.tar.bz2 forums-0818b471e6f4d518e2e6d04964105f3dec6e9c84.tar.xz forums-0818b471e6f4d518e2e6d04964105f3dec6e9c84.zip | |
- Bug 1177
git-svn-id: file:///svn/phpbb/trunk@5681 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 2b974028a6..bfdcc40b4b 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -62,16 +62,16 @@ class acp_jabber { 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)); } // 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->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); } @@ -88,22 +88,22 @@ class acp_jabber } sleep(1); - $jabber->Disconnect(); + $jabber->disconnect(); } 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)); } - if (!$jabber->SendAuth()) + if (!$jabber->send_auth()) { 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); } @@ -114,7 +114,7 @@ class acp_jabber } sleep(1); - $jabber->Disconnect(); + $jabber->disconnect(); } } |