mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 11:13:59 +02:00
fix for bug #6140 (jabber not working)
git-svn-id: file:///svn/phpbb/trunk@6771 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -453,18 +453,18 @@ class messenger
|
||||
|
||||
if (!$use_queue)
|
||||
{
|
||||
include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
|
||||
include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
|
||||
$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_resource']);
|
||||
|
||||
if (!$this->jabber->connect())
|
||||
{
|
||||
$this->error('JABBER', 'Could not connect to Jabber server');
|
||||
$this->error('JABBER', 'Could not connect to Jabber server<br />' . $this->jabber->get_log());
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$this->jabber->send_auth())
|
||||
{
|
||||
$this->error('JABBER', 'Could not authorise on Jabber server');
|
||||
$this->error('JABBER', 'Could not authorise on Jabber server<br />' . $this->jabber->get_log());
|
||||
return false;
|
||||
}
|
||||
$this->jabber->send_presence(NULL, NULL, 'online');
|
||||
@@ -636,7 +636,7 @@ class queue
|
||||
{
|
||||
if ($this->jabber->send_message($address, 'normal', NULL, array('body' => $msg)) === false)
|
||||
{
|
||||
messenger::error('JABBER', $this->jabber_get_log());
|
||||
messenger::error('JABBER', $this->jabber->get_log());
|
||||
continue 3;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user