From 5284f321789b5d0456b48a529ed59a99956020e8 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 3 Oct 2006 18:35:59 +0000
Subject: - extend config checking to include check for writeable path -
 removed not utilized user_allow_email column from schema - removed inactive
 groups (they had no use at all, since inactive users are not able to login) 
 The only benefit those brought are distinguish users - but this is no longer
 needed too due to the inactive code present. This also allows us to retain
 group memberships as well as default settings for users being set inactive
 due to profile changes. - rewrote user_active_flip to support multiple users
 and a mode, as well as coping with the aforementioned changes - implemented
 updated jabber class to support SRV server records and for better jabberd2
 support. - jabber errors now logged to the error log with a full transaction
 - fixed user_delete calls to include usernames where possible and also update
 last post information correctly - implemented additioal checks to user
 management to cope with common mistakes - On installation, guess the required
 mysql schema as best as possible. Users now only need to decide if they want
 to use the mysqli extension or not (mysqli selected by default) and no longer
 need to know their mysql version. - founders do not need to re-activate their
 account on profile changes - remove older session if re-authentication was
 successful (re-authentication always assigns a new session id) - set the
 cookie directly instead of using php's function - added inactive_remind to
 see which users got deactivated because of reminders (or re-activation) sent
 out

hopefully not introduced too many bugs - those testing with CVS releases, please concentrate on user registration, activation, profile changes (email/password)...


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

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

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 983ec7f0a5..0edf294063 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -417,13 +417,7 @@ class messenger
 		if (!$use_queue)
 		{
 			include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
-			$this->jabber = new jabber;
-
-			$this->jabber->server	= $config['jab_host'];
-			$this->jabber->port		= ($config['jab_port']) ? $config['jab_port'] : 5222;
-			$this->jabber->username = $config['jab_username'];
-			$this->jabber->password = $config['jab_password'];
-			$this->jabber->resource = ($config['jab_resource']) ? $config['jab_resource'] : '';
+			$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_resource']);
 
 			if (!$this->jabber->connect())
 			{
@@ -557,13 +551,7 @@ class queue
 					}
 
 					include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
-					$this->jabber = new jabber;
-
-					$this->jabber->server	= $config['jab_host'];
-					$this->jabber->port		= ($config['jab_port']) ? $config['jab_port'] : 5222;
-					$this->jabber->username = $config['jab_username'];
-					$this->jabber->password = $config['jab_password'];
-					$this->jabber->resource = ($config['jab_resource']) ? $config['jab_resource'] : '';
+					$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_resource']);
 
 					if (!$this->jabber->connect())
 					{
@@ -603,14 +591,19 @@ class queue
 
 							$message = 'Method: [ ' . (($config['smtp_delivery']) ? 'SMTP' : 'PHP') . ' ]<br /><br />' . $err_msg . '<br /><br /><u>CALLING PAGE</u><br /><br />'  . ((!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']);
 							messenger::error('EMAIL', $message);
-							continue 3;
+							continue 2;
 						}
 					break;
 
 					case 'jabber':
 						foreach ($addresses as $address)
 						{
-							$this->jabber->send_message($address, 'normal', NULL, array('body' => $msg));
+							if ($this->jabber->send_message($address, 'normal', NULL, array('body' => $msg)) === false)
+							{
+								$message = 'Method: [ JABBER ]<br /><br />' . $this->jabber->get_log() . '<br /><br /><u>CALLING PAGE</u><br /><br />'  . ((!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']);
+								messenger::error('JABBER', $message);
+								continue 3;
+							}
 						}
 					break;
 				}
-- 
cgit v1.2.1