- 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
author: Meik Sievertsen <acydburn@phpbb.com> 2006-10-03 18:35:59 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-10-03 18:35:59 +0000
commit: 5284f321789b5d0456b48a529ed59a99956020e8 (patch)
tree: ec6af414977763a8a2a9b570c4e071597239409e /phpBB/includes/functions_jabber.php
parent: d7f87be493589daf3d0996eb83f489c62d4380a7 (diff)
download: forums-5284f321789b5d0456b48a529ed59a99956020e8.tar
forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.gz
forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.bz2
forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.xz
forums-5284f321789b5d0456b48a529ed59a99956020e8.zip
1 files changed, 553 insertions, 304 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 9efe17dc6b..1bdeb6eb40 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -3,23 +3,24 @@
 *
 * @package phpBB3
 * @version $Id$
-* @copyright (c) 2005 phpBB Group 
+* @copyright (c) 2006 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
 
 /**
 *
-*	Class.Jabber.PHP v0.4
-*	(c) 2002 Carlo "Gossip" Zottmann
-*	http://phpjabber.g-blog.net *** gossip@jabber.g-blog.net
+*	Class.Jabber.PHP v0.4.2
+*	(c) 2004 Nathan "Fritzy" Fritz
+*	http://cjphp.netflint.net *** fritzy@netflint.net
 *
-*	The FULL documentation and examples for this software can be found at
-*	http://phpjabber.g-blog.net (not many doc comments in here, sorry)
+*	This is a bugfix version, specifically for those who can't get 
+*	0.4 to work on Jabberd2 servers. 
 *
-*	last modified: 27.04.2003 13:01:53 CET
-* 
-*	Modified by members of the phpBB Group
+*	last modified: 24.03.2004 13:01:53 
+*
+*	Modified by phpBB Development Team
+*	version: v0.4.3a
 *
 * @package phpBB3
 */
@@ -36,13 +37,14 @@ class jabber
 	var $delay_disconnect;
 
 	var $stream_id;
-	var $roster;
+
+	var $enable_logging;
+	var $log_array;
 
 	var $iq_sleep_timer;
 	var $last_ping_time;
 
 	var $packet_queue;
-	var $subscription_queue;
 
 	var $iq_version_name;
 	var $iq_version_os;
@@ -60,17 +62,24 @@ class jabber
 	/**
 	* Constructor
 	*/
-	function jabber()
+	function jabber($server, $port, $username, $password, $resource)
 	{
-		$this->port					= '5222';
-		$this->resource				= NULL;
-		$this->packet_queue			= $this->subscription_queue = array();
+		$this->server				= ($server) ? $server : 'localhost';
+		$this->port					= ($port) ? $port : '5222';
+		$this->username				= $username;
+		$this->password				= $password;
+		$this->resource				= ($resource) ? $resource : NULL;
+
+		$this->enable_logging		= true;
+		$this->log_array			= array();
+
+		$this->packet_queue			= array();
 		$this->iq_sleep_timer		= $this->delay_disconnect = 1;
 
 		$this->returned_keep_alive	= true;
 		$this->txnid				= 0;
 
-		$this->iq_version_name		= "Class.Jabber.PHP -- http://phpjabber.g-blog.net -- by Carlo 'Gossip' Zottmann, gossip@jabber.g-blog.net";
+		$this->iq_version_name		= "Class.Jabber.PHP -- http://cjphp.netflint.net -- by Nathan 'Fritzy' Fritz, fritz@netflint.net";
 		$this->iq_version_version	= '0.4';
 		$this->iq_version_os		= $_SERVER['SERVER_SOFTWARE'];
 
@@ -104,7 +113,7 @@ class jabber
 		if ($this->connector->open_socket($this->server, $this->port))
 		{
 			$this->send_packet("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-			$this->send_packet("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>\n");
+			$this->send_packet("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
 
 			sleep(2);
 
@@ -115,11 +124,13 @@ class jabber
 			}
 			else
 			{
+				$this->add_to_log('ERROR: connect() #1');
 				return false;
 			}
 		}
 		else
 		{
+			$this->add_to_log('ERROR: connect() #2');
 			return false;
 		}
 	}
@@ -139,55 +150,12 @@ class jabber
 	}
 
 	/**
-	* Cruise Control
-	*/
-	function cruise_control($seconds = -1)
-	{
-		$count = 0;
-
-		while ($count != $seconds)
-		{
-			$this->listen();
-
-			do
-			{
-				$packet = $this->get_first_from_queue();
-
-				if ($packet)
-				{
-					$this->call_handler($packet);
-				}
-			}
-			while (sizeof($this->packet_queue) > 1);
-
-			$count += 0.25;
-			usleep(250000);
-
-			if ($this->last_ping_time != date('H:i'))
-			{
-				// Modified by Nathan Fritz
-				if ($this->returned_keep_alive == false)
-				{
-					$this->connected = false;
-					//EVENT: Disconnected
-				}
-
-				$this->returned_keep_alive = false;
-				$this->keep_alive_id = 'keep_alive_' . time();
-				$this->send_packet("<iq id='{$this->keep_alive_id}'/>", 'cruise_control');
-				$this->last_ping_time = date('H:i');
-			}
-		}
-
-		return true;
-	}
-
-	/**
 	* Send authentication request
 	*/
 	function send_auth()
 	{
 		$this->auth_id	= 'auth_' . md5(time() . $_SERVER['REMOTE_ADDR']);
+		$this->resource	= ($this->resource != NULL) ? $this->resource : ('Class.Jabber.PHP ' . md5($this->auth_id));
 		$this->jid		= "{$this->username}@{$this->server}/{$this->resource}";
 
 		// request available authentication methods
@@ -197,6 +165,7 @@ class jabber
 		// was a result returned?
 		if ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id)
 		{
+			// yes, now check for auth method availability in descending order (best to worst)
 			if (isset($packet['iq']['#']['query'][0]['#']['sequence'][0]['#']) && isset($packet['iq']['#']['query'][0]['#']['token'][0]['#']))
 			{
 				// auth_0k
@@ -212,10 +181,16 @@ class jabber
 				// plain text
 				return $this->_sendauth_plaintext();
 			}
+			else
+			{
+				$this->add_to_log('ERROR: send_auth() #2 - No auth method available!');
+				return false;
+			}
 		}
 		else
 		{
 			// no result returned
+			$this->add_to_log('ERROR: send_auth() #1');
 			return false;
 		}
 	}
@@ -319,86 +294,15 @@ class jabber
 	{
 		$xml = trim($xml);
 
-		return ($this->connector->write_to_socket($xml)) ? true : false;
-	}
-
-	/**
-	* get the transport registration fields
-	* method written by Steve Blinch, http://www.blitzaffe.com 
-	*/
-	function transport_registration_details($transport)
-	{
-		$this->txnid++;
-		$packet = $this->send_iq($transport, 'get', "reg_{$this->txnid}", "jabber:iq:register", NULL, $this->jid);
-
-		if ($packet)
+		if ($this->connector->write_to_socket($xml))
 		{
-			$res = array();
-
-			foreach ($packet['iq']['#']['query'][0]['#'] as $element => $data)
-			{
-				if ($element != 'instructions' && $element != 'key')
-				{
-					$res[] = $element;
-				}
-			}
-
-			return $res;
-		}
-		else
-		{
-			return 3;
-		}
-	}
-
-	/**
-	* register with the transport
-	* method written by Steve Blinch, http://www.blitzaffe.com 
-	*/
-	function transport_registration($transport, $details)
-	{
-		$this->txnid++;
-		$packet = $this->send_iq($transport, 'get', "reg_{$this->txnid}", "jabber:iq:register", NULL, $this->jid);
-
-		if ($packet)
-		{
-			// just in case a key was passed back from the server
-			$key = $this->get_info_from_iq_key($packet);
-			unset($packet);
-
-			$payload = ($key) ? "<key>$key</key>\n" : '';
-			foreach ($details as $element => $value)
-			{
-				$payload .= "<$element>$value</$element>\n";
-			}
-
-			$packet = $this->send_iq($transport, 'set', "reg_{$this->txnid}", "jabber:iq:register", $payload);
-
-			if ($this->get_info_from_iq_type($packet) == 'result')
-			{
-				if (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#']))
-				{
-					$return_code = 1;
-				}
-				else
-				{
-					$return_code = 2;
-				}
-			}
-			else if ($this->get_info_from_iq_type($packet) == 'error')
-			{
-				if (isset($packet['iq']['#']['error'][0]['#']))
-				{
-					$return_code = "Error " . $packet['iq']['#']['error'][0]['@']['code'] . ": " . $packet['iq']['#']['error'][0]['#'];
-					// ERROR: TransportRegistration()
-				}
-			}
-
-			return $return_code;
+			$this->add_to_log('SEND: ' . $xml);
+			return true;
 		}
 		else
 		{
-			return 3;
+			$this->add_to_log('ERROR: send_packet() #1');
+			return false;
 		}
 	}
 
@@ -418,11 +322,12 @@ class jabber
 
 		if ($incoming != '')
 		{
+			$this->add_to_log('RECV: ' . $incoming);
 			$temp = $this->_split_incoming($incoming);
 
-			for ($a = 0, $size = sizeof($temp); $a < $size; $a++)
+			for ($i = 0, $size = sizeof($temp); $i < $size; $i++)
 			{
-				$this->packet_queue[] = $this->xmlize($temp[$a]);
+				$this->packet_queue[] = $this->xmlize($temp[$i]);
 			}
 		}
 
@@ -454,12 +359,12 @@ class jabber
 
 			$xml = "<message to='$to' type='$type' id='$id'>\n";
 
-			if (isset($content['subject']) && $content['subject'])
+			if (!empty($content['subject']))
 			{
 				$xml .= '<subject>' . $content['subject'] . "</subject>\n";
 			}
 
-			if (isset($content['thread']) && $content['thread'])
+			if (!empty($content['thread']))
 			{
 				$xml .= '<thread>' . $content['thread'] . "</thread>\n";
 			}
@@ -468,10 +373,18 @@ class jabber
 			$xml .= $payload;
 			$xml .= "</message>\n";
 
-			return ($this->send_packet($xml)) ? true : false;
+			if ($this->send_packet($xml))
+			{
+				return true;
+			}
+			else
+			{
+				$this->add_to_log('ERROR: send_message() #1');
+			}
 		}
 		else
 		{
+			$this->add_to_log('ERROR: send_message() #2');
 			return false;
 		}
 	}
@@ -492,7 +405,15 @@ class jabber
 
 		$xml .= ($status || $show || $priority) ? "</presence>\n" : '';
 
-		return ($this->send_packet($xml)) ? true : false;
+		if ($this->send_packet($xml))
+		{
+			return true;
+		}
+		else
+		{
+			$this->add_to_log('ERROR: send_presence() #1');
+			return false;
+		}
 	}
 
 	/**
@@ -579,11 +500,63 @@ class jabber
 			else
 			{
 				$this->handler_not_implemented($packet);
+				$this->add_to_log("ERROR: call_handler() #1 - neither method nor function $funcmeth() available");
 			}
 		}
 	}
 
 	/**
+	* Cruise Control
+	*/
+	function cruise_control($seconds = -1)
+	{
+		$count = 0;
+
+		while ($count != $seconds)
+		{
+			$this->listen();
+
+			do
+			{
+				$packet = $this->get_first_from_queue();
+
+				if ($packet)
+				{
+					$this->call_handler($packet);
+				}
+			}
+			while (sizeof($this->packet_queue) > 1);
+
+			$count += 0.25;
+			usleep(250000);
+
+			if (($this->last_ping_time + 180) < time())
+			{
+				// Modified by Nathan Fritz
+				if ($this->returned_keep_alive == false)
+				{
+					$this->connected = false;
+					$this->add_to_log('EVENT: Disconnected');
+				}
+
+				if ($this->returned_keep_alive == true)
+				{
+					$this->connected = true;
+				}
+
+				$this->returned_keep_alive = false;
+
+				$this->keep_alive_id = 'keep_alive_' . time();
+				// $this->send_packet("<iq id='{$this->keep_alive_id}'/>", 'cruise_control');
+				$this->send_packet("<iq type='get' from='{$this->username}@{$this->server}/{$this->resource}' to='{$this->server}' id='{$this->keep_alive_id}'><query xmlns='jabber:iq:time' /></iq>");
+				$this->last_ping_time = time();
+			}
+		}
+
+		return true;
+	}
+
+	/**
 	* Send iq
 	*/
 	function send_iq($to = NULL, $type = 'get', $id = NULL, $xmlns = NULL, $payload = NULL, $from = NULL)
@@ -592,12 +565,13 @@ class jabber
 		{
 			unset($type);
 
+			$this->add_to_log("ERROR: send_iq() #2 - type must be 'get', 'set', 'result' or 'error'");
 			return false;
 		}
 		else if ($id && $xmlns)
 		{
 			$xml = "<iq type='$type' id='$id'";
-			$xml .= ($to) ? " to='$to'" : '';
+			$xml .= ($to) ? " to='" . htmlspecialchars($to) . "'" : '';
 			$xml .= ($from) ? " from='$from'" : '';
 			$xml .= ">
 						<query xmlns='$xmlns'>
@@ -613,10 +587,109 @@ class jabber
 		}
 		else
 		{
+			$this->add_to_log('ERROR: send_iq() #1 - to, id and xmlns are mandatory');
 			return false;
 		}
 	}
 
+	/**
+	* get the transport registration fields
+	* method written by Steve Blinch, http://www.blitzaffe.com 
+	*/
+	function transport_registration_details($transport)
+	{
+		$this->txnid++;
+		$packet = $this->send_iq($transport, 'get', "reg_{$this->txnid}", 'jabber:iq:register', NULL, $this->jid);
+
+		if ($packet)
+		{
+			$res = array();
+
+			foreach ($packet['iq']['#']['query'][0]['#'] as $element => $data)
+			{
+				if ($element != 'instructions' && $element != 'key')
+				{
+					$res[] = $element;
+				}
+			}
+
+			return $res;
+		}
+		else
+		{
+			return 3;
+		}
+	}
+
+	/**
+	* register with the transport
+	* method written by Steve Blinch, http://www.blitzaffe.com 
+	*/
+	function transport_registration($transport, $details)
+	{
+		$this->txnid++;
+		$packet = $this->send_iq($transport, 'get', "reg_{$this->txnid}", 'jabber:iq:register', NULL, $this->jid);
+
+		if ($packet)
+		{
+			// just in case a key was passed back from the server
+			$key = $this->get_info_from_iq_key($packet);
+			unset($packet);
+
+			$payload = ($key) ? "<key>$key</key>\n" : '';
+			foreach ($details as $element => $value)
+			{
+				$payload .= "<$element>$value</$element>\n";
+			}
+
+			$packet = $this->send_iq($transport, 'set', "reg_{$this->txnid}", 'jabber:iq:register', $payload);
+
+			if ($this->get_info_from_iq_type($packet) == 'result')
+			{
+				$return_code = (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#'])) ? 1 : 2;
+			}
+			else if ($this->get_info_from_iq_type($packet) == 'error')
+			{
+				if (isset($packet['iq']['#']['error'][0]['#']))
+				{
+					$return_code = 'Error ' . $packet['iq']['#']['error'][0]['@']['code'] . ': ' . $packet['iq']['#']['error'][0]['#'];
+					$this->add_to_log('ERROR: transport_registration()');
+				}
+			}
+
+			return $return_code;
+		}
+		else
+		{
+			return 3;
+		}
+	}
+
+	/**
+	* Return log
+	*/
+	function get_log()
+	{
+		if ($this->enable_logging && sizeof($this->log_array))
+		{
+			return implode("\n\n", $this->log_array);
+		}
+
+		return '';
+	}
+
+	/**
+	* Add information to log
+	*/
+	function add_to_log($string)
+	{
+		if ($this->enable_logging)
+		{
+			$this->log_array[] = htmlspecialchars($string);
+		}
+	}
+
+
 	// ======================================================================
 	// private methods
 	// ======================================================================
@@ -634,7 +707,7 @@ class jabber
 		$zerok_hash = sha1($zerok_hash . $zerok_token);
 
 		// repeat as often as needed
-		for ($a = 0; $a < $zerok_sequence; $a++)
+		for ($i = 0; $i < $zerok_sequence; $i++)
 		{
 			$zerok_hash = sha1($zerok_hash);
 		}
@@ -646,7 +719,15 @@ class jabber
 		$packet = $this->send_iq(NULL, 'set', $this->auth_id, 'jabber:iq:auth', $payload);
 
 		// was a result returned?
-		return ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id) ? true : false;
+		if ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id)
+		{
+			return true;
+		}
+		else
+		{
+			$this->add_to_log('ERROR: _sendauth_ok() #1');
+			return false;
+		}
 	}
 
 	/**
@@ -662,7 +743,15 @@ class jabber
 		$packet = $this->send_iq(NULL, 'set', $this->auth_id, 'jabber:iq:auth', $payload);
 
 		// was a result returned?
-		return ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id) ? true : false;
+		if ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id)
+		{
+			return true;
+		}
+		else
+		{
+			$this->add_to_log('ERROR: _sendauth_digest() #1');
+			return false;
+		}
 	}
 
 	/**
@@ -678,7 +767,15 @@ class jabber
 		$packet = $this->send_iq(NULL, 'set', $this->auth_id, 'jabber:iq:auth', $payload);
 
 		// was a result returned?
-		return ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id) ? true : false;
+		if ($this->get_info_from_iq_type($packet) == 'result' && $this->get_info_from_iq_id($packet) == $this->auth_id)
+		{
+			return true;
+		}
+		else
+		{
+			$this->add_to_log('ERROR: _sendauth_plaintext() #1');
+			return false;
+		}
 	}
 
 	/**
@@ -695,6 +792,12 @@ class jabber
 		}
 
 		$incoming = trim($incoming);
+
+		if ($incoming != '')
+		{
+			$this->add_to_log('RECV: ' . $incoming);
+		}
+
 		return $this->xmlize($incoming);
 	}
 
@@ -708,40 +811,82 @@ class jabber
 
 		if (is_array($incoming_array))
 		{
-			if ($incoming_array['stream:stream']['@']['from'] == $this->server
-				&& $incoming_array['stream:stream']['@']['xmlns'] == 'jabber:client'
-				&& $incoming_array['stream:stream']['@']['xmlns:stream'] == 'http://etherx.jabber.org/streams')
+			if ($incoming_array['stream:stream']['@']['from'] == $this->server && $incoming_array['stream:stream']['@']['xmlns'] == 'jabber:client' && $incoming_array['stream:stream']['@']['xmlns:stream'] == 'http://etherx.jabber.org/streams')
 			{
 				$this->stream_id = $incoming_array['stream:stream']['@']['id'];
 
-				return true;
+				if ($incoming_array['stream:stream']['#']['stream:features'][0]['#']['starttls'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-tls')
+				{
+					return $this->_starttls();
+				}
+				else
+				{
+					return true;
+				}
 			}
 			else
 			{
+				$this->add_to_log('ERROR: _check_connected() #1');
 				return false;
 			}
 		}
 		else
 		{
+			$this->add_to_log('ERROR: _check_connected() #2');
 			return false;
 		}
 	}
 
 	/**
-	* Split incoming packet
+	* Start TLS/SSL session if supported (PHP5.1)
 	* @access private
 	*/
-	function _split_incoming($incoming)
+	function _starttls()
 	{
-		$temp = preg_split('#<(message|iq|presence|stream)#', $incoming, -1, PREG_SPLIT_DELIM_CAPTURE);
-		$array = array();
+		if (!function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('socket_set_blocking'))
+		{
+			$this->add_to_log('WARNING: TLS is not available');
+			return true;
+		}
 
-		for ($a = 1; $a < sizeof($temp); $a = $a + 2)
+		$this->send_packet("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n");
+		sleep(2);
+		$incoming_array = $this->_listen_incoming();
+
+		if (!is_array($incoming_array))
 		{
-			$array[] = '<' . $temp[$a] . $temp[($a + 1)];
+			$this->add_to_log('ERROR: _starttls() #1');
+			return false;
 		}
 
-		return $array;
+		if ($incoming_array['proceed']['@']['xmlns'] != 'urn:ietf:params:xml:ns:xmpp-tls')
+		{
+			$this->add_to_log('ERROR: _starttls() #2');
+			return false;
+		}
+
+		$meta = stream_get_meta_data($this->connector->active_socket);
+		socket_set_blocking($this->connector->active_socket, 1);
+
+		if (!stream_socket_enable_crypto($this->connector->active_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
+		{
+			socket_set_blocking($this->connector->active_socket, $meta['blocked']);
+			$this->add_to_log('ERROR: _starttls() #3');
+			return false;
+		}
+		socket_set_blocking($this->connector->active_socket, $meta['blocked']);
+
+		$this->send_packet("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
+		$this->send_packet("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
+		sleep(2);
+
+		if (!$this->_check_connected())
+		{
+			$this->add_to_log('ERROR: _starttls() #4');
+			return false;
+		}
+
+		return true;
 	}
 
 	/**
@@ -760,6 +905,23 @@ class jabber
 	}
 
 	/**
+	* Split incoming packet
+	* @access private
+	*/
+	function _split_incoming($incoming)
+	{
+		$temp = preg_split('#<(message|iq|presence|stream)#', $incoming, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$array = array();
+
+		for ($i = 1, $size = sizeof($temp); $i < $size; $i += 2)
+		{
+			$array[] = '<' . $temp[$i] . $temp[($i + 1)];
+		}
+
+		return $array;
+	}
+
+	/**
 	* Recursively prepares the strings in an array to be used in XML data.
 	* @access private
 	*/
@@ -844,6 +1006,14 @@ class jabber
 	}
 
 	/**
+	* Get info from message (xmlns)
+	*/
+	function get_info_from_message_xmlns($packet = NULL)
+	{
+		return (is_array($packet)) ? $packet['message']['#']['x'] : false;
+	}
+
+	/**
 	* Get info from message (error)
 	*/
 	function get_info_from_message_error($packet = NULL)
@@ -902,19 +1072,48 @@ class jabber
 	// ======================================================================
 
 	/**
-	* return message (from)
+	* Message type normal
 	*/
 	function handler_message_normal($packet)
 	{
 		$from = $packet['message']['@']['from'];
+		$this->add_to_log("EVENT: Message (type normal) from $from");
+	}
+
+	/**
+	* Message type chat
+	*/
+	function handler_message_chat($packet)
+	{
+		$from = $packet['message']['@']['from'];
+		$this->add_to_log("EVENT: Message (type chat) from $from");
+	}
+
+	/**
+	* Message type groupchat
+	*/
+	function handler_message_groupchat($packet)
+	{
+		$from = $packet['message']['@']['from'];
+		$this->add_to_log("EVENT: Message (type groupchat) from $from");
 	}
 
 	/**
-	* return error (from)
+	* Message type headline
+	*/
+	function handler_message_headline($packet)
+	{
+		$from = $packet['message']['@']['from'];
+		$this->add_to_log("EVENT: Message (type headline) from $from");
+	}
+
+	/**
+	* Message type error
 	*/
 	function handler_message_error($packet)
 	{
 		$from = $packet['message']['@']['from'];
+		$this->add_to_log("EVENT: Message (type error) from $from");
 	}
 
 	// ======================================================================
@@ -922,6 +1121,42 @@ class jabber
 	// ======================================================================
 
 	/**
+	* application version updates
+	*/
+	function handler_iq_jabber_iq_autoupdate($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:autoupdate from $from");
+	}
+
+	/**
+	* interactive server component properties
+	*/
+	function handler_iq_jabber_iq_agent($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:agent from $from");
+	}
+
+	/**
+	* method to query interactive server components
+	*/
+	function handler_iq_jabber_iq_agents($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:agents from $from");
+	}
+
+	/**
 	* simple client authentication
 	*/
 	function handler_iq_jabber_iq_auth($packet)
@@ -930,6 +1165,31 @@ class jabber
 		$id		= $this->get_info_from_iq_id($packet);
 
 		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:auth from $from");
+	}
+
+	/**
+	* out of band data
+	*/
+	function handler_iq_jabber_iq_oob($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:oob from $from");
+	}
+
+	/**
+	* method to store private data on the server
+	*/
+	function handler_iq_jabber_iq_private($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:private from $from");
 	}
 
 	/**
@@ -941,19 +1201,89 @@ class jabber
 		$id		= $this->get_info_from_iq_id($packet);
 
 		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:register from $from");
+	}
+
+	/**
+	* client roster management
+	*/
+	function handler_iq_jabber_iq_roster($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:roster from $from");
+	}
+
+	/**
+	* method for searching a user database
+	*/
+	function handler_iq_jabber_iq_search($packet)
+	{
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+
+		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: jabber:iq:search from $from");
 	}
 
 	/**
-	* keepalive method, added by Nathan Fritz
+	* method for requesting the current time
 	*/
-	function handler_iq_($packet)
+	function handler_iq_jabber_iq_time($packet)
 	{
 		if ($this->keep_alive_id == $this->get_info_from_iq_id($packet))
 		{
 			$this->returned_keep_alive = true;
+			$this->connected = true;
+
+			$this->add_to_log('EVENT: Keep-Alive returned, connection alive.');
+		}
+
+		$type	= $this->get_info_from_iq_type($packet);
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+		$id		= ($id != '') ? $id : 'time_' . time();
+
+		if ($type == 'get')
+		{
+			$payload = '<utc>' . gmdate("Ydm\TH:i:s") . '</utc><tz>' . date('T') . '</tz><display>' . date("Y/d/m h:i:s A") . '</display>';
+			$this->send_iq($from, 'result', $id, 'jabber:iq:time', $payload);
 		}
+
+		$this->add_to_log("EVENT: jabber:iq:time (type $type) from $from");
+	}
+
+	/**
+	*/
+	function handler_iq_error($packet)
+	{
+		// We'll do something with these later. This is a placeholder so that errors don't bounce back and forth.
 	}
-	
+
+	/**
+	* method for requesting version
+	*/
+	function handler_iq_jabber_iq_version($packet)
+	{
+		$type	= $this->get_info_from_iq_type($packet);
+		$from	= $this->get_info_from_iq_from($packet);
+		$id		= $this->get_info_from_iq_id($packet);
+		$id		= ($id != '') ? $id : 'version_' . time();
+
+		if ($type == 'get')
+		{
+			$payload = "<name>{$this->iq_version_name}</name>
+				<os>{$this->iq_version_os}</os>
+				<version>{$this->iq_version_version}</version>";
+
+			//$this->SendIq($from, 'result', $id, "jabber:iq:version", $payload);
+		}
+
+		$this->add_to_log("EVENT: jabber:iq:version (type $type) from $from -- DISABLED");
+	}
+
 	// ======================================================================
 	// Generic handlers
 	// ======================================================================
@@ -968,28 +1298,34 @@ class jabber
 		$id				= call_user_func(array(&$this, 'get_info_from_' . strtolower($packet_type) . '_id'), $packet);
 
 		$this->send_error($from, $id, 501);
+		$this->add_to_log("EVENT: Unrecognized <$packet_type/> from $from");
 	}
 
+	// ======================================================================
 	// Third party code
 	// m@d pr0ps to the coders ;)
+	// ======================================================================
 
 	/**
 	* xmlize()
-	* (c) Hans Anderson / http://www.hansanderson.com/php/xml/
+	* @author Hans Anderson
+	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
 	*/
-	function xmlize($data)
+	function xmlize($data, $skip_white = 1, $encoding = 'UTF-8')
 	{
+		$data = trim($data);
+
 		$vals = $index = $array = array();
-		$parser = @xml_parser_create();
-		@xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		@xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-		@xml_parse_into_struct($parser, $data, $vals, $index);
-		@xml_parser_free($parser);
+		$parser = xml_parser_create($encoding);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $skip_white);
+		xml_parse_into_struct($parser, $data, $vals, $index);
+		xml_parser_free($parser);
 
 		$i = 0;
-
 		$tagname = $vals[$i]['tag'];
-		$array[$tagname]['@'] = $vals[$i]['attributes'];
+
+		$array[$tagname]['@'] = (isset($vals[$i]['attributes'])) ? $vals[$i]['attributes'] : array();
 		$array[$tagname]['#'] = $this->_xml_depth($vals, $i);
 
 		return $array;
@@ -997,47 +1333,51 @@ class jabber
 
 	/**
 	* _xml_depth()
-	* (c) Hans Anderson / http://www.hansanderson.com/php/xml/
+	* @author Hans Anderson
+	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
 	*/
 	function _xml_depth($vals, &$i)
 	{
 		$children = array();
 
-		if (isset($vals[$i]['value']) && $vals[$i]['value'])
+		if (isset($vals[$i]['value']))
 		{
-			array_push($children, trim($vals[$i]['value']));
+			array_push($children, $vals[$i]['value']);
 		}
 
 		while (++$i < sizeof($vals))
 		{
 			switch ($vals[$i]['type'])
 			{
-				case 'cdata':
-					array_push($children, trim($vals[$i]['value']));
-	 			break;
+				case 'open':
 
-				case 'complete':
-					$tagname = $vals[$i]['tag'];
+					$tagname = (isset($vals[$i]['tag'])) ? $vals[$i]['tag'] : '';
 					$size = (isset($children[$tagname])) ? sizeof($children[$tagname]) : 0;
-					$children[$tagname][$size]['#'] = (isset($vals[$i]['value'])) ? trim($vals[$i]['value']) : '';
-					if (isset($vals[$i]['attributes']) && $vals[$i]['attributes'])
+
+					if (isset($vals[$i]['attributes']))
 					{
 						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
 					}
+
+					$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
+
 				break;
 
-				case 'open':
+				case 'cdata':
+					array_push($children, $vals[$i]['value']);
+				break;
+
+				case 'complete':
+
 					$tagname = $vals[$i]['tag'];
 					$size = (isset($children[$tagname])) ? sizeof($children[$tagname]) : 0;
-					if ($vals[$i]['attributes'])
+					$children[$tagname][$size]['#'] = (isset($vals[$i]['value'])) ? $vals[$i]['value'] : array();
+
+					if (isset($vals[$i]['attributes']))
 					{
 						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-						$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
-					}
-					else
-					{
-						$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
 					}
+
 				break;
 
 				case 'close':
@@ -1050,8 +1390,9 @@ class jabber
 	}
 
 	/**
-	* traverse_xmlize()
-	* (c) acebone@f2s.com, a HUGE help!
+	* TraverseXMLize()
+	* @author acebone@f2s.com
+	* @copyright acebone@f2s.com, a HUGE help!
 	*/
 	function traverse_xmlize($array, $arr_name = 'array', $level = 0)
 	{
@@ -1060,7 +1401,7 @@ class jabber
 			echo '<pre>';
 		}
 
-		while (list($key, $val) = @each($array))
+		foreach ($array as $key => $val)
 		{
 			if (is_array($val))
 			{
@@ -1068,7 +1409,7 @@ class jabber
 			}
 			else
 			{
-				echo '$' . $arr_name . '[' . $key . '] = "' . $val . "\"\n";
+				$GLOBALS['traverse_array'][] = '$' . $arr_name . '[' . $key . '] = "' . $val . "\"\n";
 			}
 		}
 
@@ -1076,117 +1417,13 @@ class jabber
 		{
 			echo '</pre>';
 		}
-	}
-}
-
-/**
-* make_xml
-* Currently not in use
-* @package phpBB3
-class make_xml extends jabber
-{
-	var $nodes;
-
-	function make_xml()
-	{
-		$nodes = array();
-	}
-
-	function add_packet_details($string, $value = NULL)
-	{
-		if (preg_match('#\(([0-9]*)\)$#i', $string))
-		{
-			$string .= '/["#"]';
-		}
-
-		$temp = @explode('/', $string);
-
-		for ($a = 0, $size = sizeof($temp); $a < $size; $a++)
-		{
-			$temp[$a] = preg_replace('#^[@]{1}([a-z0-9_]*)$#i', '["@"]["\1"]', $temp[$a]);
-			$temp[$a] = preg_replace('#^([a-z0-9_]*)\(([0-9]*)\)$/i', '["\1"][\2]', $temp[$a]);
-			$temp[$a] = preg_replace('#^([a-z0-9_]*)$#i', '["\1"]', $temp[$a]);
-		}
-
-		$node = implode('', $temp);
 
-		// Yeahyeahyeah, I know it's ugly... get over it. ;)
-		echo '$this->nodes' . $node . ' = "' . htmlspecialchars($value) . '";<br/>';
-		eval('$this->nodes' . $node . ' = "' . htmlspecialchars($value) . '";');
-	}
-
-	function build_packet($array = NULL)
-	{
-		if (!$array)
-		{
-			$array = $this->nodes;
-		}
-
-		if (is_array($array))
-		{
-			array_multisort($array, SORT_ASC, SORT_STRING);
-
-			foreach ($array as $key => $value)
-			{
-				if (is_array($value) && $key == '@')
-				{
-					foreach ($value as $subkey => $subvalue)
-					{
-						$subvalue = htmlspecialchars($subvalue);
-						$text .= " $subkey='$subvalue'";
-					}
-
-					$text .= ">\n";
-
-				}
-				else if ($key == '#')
-				{
-					$text .= htmlspecialchars($value);
-				}
-				else if (is_array($value))
-				{
-					for ($a = 0, $size = sizeof($value); $a < $size; $a++)
-					{
-						$text .= "<$key";
-
-						if (!$this->_preg_grep_keys('#^@#', $value[$a]))
-						{
-							$text .= '>';
-						}
-
-						$text .= $this->build_packet($value[$a]);
-						$text .= "</$key>\n";
-					}
-				}
-				else
-				{
-					$value = htmlspecialchars($value);
-					$text .= "<$key>$value</$key>\n";
-				}
-			}
-
-			return $text;
-		}
-
-		return false;
-	}
-
-	function _preg_grep_keys($pattern, $array)
-	{
-		foreach ($array as $key => $val)
-		{
-			if (preg_match($pattern, $key))
-			{
-				$newarray[$key] = $val;
-			}
-		}
-		return (is_array($newarray)) ? $newarray : false;
+		return 1;
 	}
 }
-*/
 
 /**
-* connector
+* Jabber Connector
 * @package phpBB3
 */
 class cjp_standard_connector
@@ -1198,7 +1435,21 @@ class cjp_standard_connector
 	*/
 	function open_socket($server, $port)
 	{
-		if ($this->active_socket = @fsockopen($server, $port, $err, $err2, 5))
+		if (function_exists('dns_get_record'))
+		{
+			$record = dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
+
+			if (!empty($record))
+			{
+				$server = $record[0]['target'];
+				$port = $record[0]['port'];
+			}
+		}
+
+		$errno = 0;
+		$errstr = '';
+
+		if ($this->active_socket = @fsockopen($server, $port, $errno, $errstr, 5))
 		{
 			@socket_set_blocking($this->active_socket, 0);
 			@socket_set_timeout($this->active_socket, 31536000);
@@ -1233,9 +1484,7 @@ class cjp_standard_connector
 	function read_from_socket($chunksize)
 	{
 		$buffer = @fread($this->active_socket, $chunksize);
-
-		//$buffer = (STRIP) ? stripslashes($buffer) : $buffer;
-		//@set_magic_quotes_runtime(get_magic_quotes_gpc());
+		$buffer = (STRIP) ? stripslashes($buffer) : $buffer;
 
 		return $buffer;
 	}
author	Meik Sievertsen <acydburn@phpbb.com>	2006-10-03 18:35:59 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-10-03 18:35:59 +0000
commit	5284f321789b5d0456b48a529ed59a99956020e8 (patch)
tree	ec6af414977763a8a2a9b570c4e071597239409e /phpBB/includes/functions_jabber.php
parent	d7f87be493589daf3d0996eb83f489c62d4380a7 (diff)
download	forums-5284f321789b5d0456b48a529ed59a99956020e8.tar forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.gz forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.bz2 forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.xz forums-5284f321789b5d0456b48a529ed59a99956020e8.zip