diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-16 12:57:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-16 12:57:01 +0000 |
| commit | 204187187ddd3f556b67c3c78373034a73d760e7 (patch) | |
| tree | e8b7c0072afa2d8df2921279d40379d406009f93 /phpBB/includes/functions_messenger.php | |
| parent | 2e4cd16058cc548068a94047c9c31e5a9ad272d0 (diff) | |
| download | forums-204187187ddd3f556b67c3c78373034a73d760e7.tar forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.gz forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.bz2 forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.xz forums-204187187ddd3f556b67c3c78373034a73d760e7.zip | |
fix for bug #6140 (jabber not working)
git-svn-id: file:///svn/phpbb/trunk@6771 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 650deb6a0d..b6af4ef12f 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -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; } } |