From 204187187ddd3f556b67c3c78373034a73d760e7 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 16 Dec 2006 12:57:01 +0000
Subject: fix for bug #6140 (jabber not working)

git-svn-id: file:///svn/phpbb/trunk@6771 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_messenger.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/functions_messenger.php')

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;
 							}
 						}
-- 
cgit v1.2.1