5 files changed, 54 insertions, 30 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index e6ea124ae5..aa7429dc96 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -72,6 +72,13 @@ class acp_icons
 
 			foreach ($imglist as $path => $img_ary)
 			{
+				if (empty($img_ary))
+				{
+					continue;
+				}
+
+				asort($img_ary, SORT_STRING);
+
 				foreach ($img_ary as $img)
 				{
 					$img_size = getimagesize(PHPBB_ROOT_PATH . $img_path . '/' . $path . $img);
@@ -98,6 +105,11 @@ class acp_icons
 					}
 				}
 				closedir($dir);
+
+				if (!empty($_paks))
+				{
+					asort($_paks, SORT_STRING);
+				}
 			}
 		}
 
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 3af7881043..5fc7123db7 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 *
 * Jabber class from Flyspray project
 *
-* @version class.jabber2.php 1488 2007-11-25
+* @version class.jabber2.php 1595 2008-09-19 (0.9.9)
 * @copyright 2006 Flyspray.org
 * @author Florian Schmitz (floele)
 *
@@ -35,6 +35,7 @@ class jabber
 	private $timeout = 10;
 
 	private $server;
+	private $connect_server;
 	private $port;
 	private $username;
 	private $password;
@@ -50,9 +51,23 @@ class jabber
 	*/
 	function __construct($server, $port, $username, $password, $use_ssl = false)
 	{
-		$this->server				= ($server) ? $server : 'localhost';
+		$this->connect_server		= ($server) ? $server : 'localhost';
 		$this->port					= ($port) ? $port : 5222;
-		$this->username				= $username;
+
+		// Get the server and the username
+		if (strpos($username, '@') === false)
+		{
+			$this->server = $this->connect_server;
+			$this->username = $username;
+		}
+		else
+		{
+			$jid = explode('@', $username, 2);
+
+			$this->username = $jid[0];
+			$this->server = $jid[1];
+		}
+
 		$this->password				= $password;
 		$this->use_ssl				= ($use_ssl && self::can_use_ssl()) ? true : false;
 
@@ -123,7 +138,7 @@ class jabber
 
 		$this->session['ssl'] = $this->use_ssl;
 
-		if ($this->open_socket($this->server, $this->port, $this->use_ssl))
+		if ($this->open_socket($this->connect_server, $this->port, $this->use_ssl))
 		{
 			$this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
 			$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
@@ -499,14 +514,7 @@ class jabber
 				}
 
 				// better generate a cnonce, maybe it's needed
-				$str = '';
-				mt_srand((double)microtime()*10000000);
-
-				for ($i = 0; $i < 32; $i++)
-				{
-					$str .= chr(mt_rand(0, 255));
-				}
-				$decoded['cnonce'] = base64_encode($str);
+				$decoded['cnonce'] = base64_encode(md5(uniqid(mt_rand(), true)));
 
 				// second challenge?
 				if (isset($decoded['rspauth']))
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 85f2089628..ad24758aee 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -763,20 +763,20 @@ function posting_gen_inline_attachments(&$attachment_data)
 /**
 * Generate inline attachment entry
 */
-function posting_gen_attachment_entry($attachment_data, &$filename_data)
+function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_attach_box = true)
 {
-	global $template, $config, $user;
+	global $template, $config, $user, $auth;
 
+	// Some default template variables
 	$template->assign_vars(array(
-		'S_SHOW_ATTACH_BOX'	=> true)
-	);
+		'S_SHOW_ATTACH_BOX'	=> $show_attach_box,
+		'S_HAS_ATTACHMENTS'	=> sizeof($attachment_data),
+		'FILESIZE'			=> $config['max_filesize'],
+		'FILE_COMMENT'		=> (isset($filename_data['filecomment'])) ? $filename_data['filecomment'] : '',
+	));
 
 	if (sizeof($attachment_data))
 	{
-		$template->assign_vars(array(
-			'S_HAS_ATTACHMENTS'	=> true)
-		);
-
 		// We display the posted attachments within the desired order.
 		($config['display_order']) ? krsort($attachment_data) : ksort($attachment_data);
 
@@ -806,11 +806,6 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data)
 		}
 	}
 
-	$template->assign_vars(array(
-		'FILE_COMMENT'	=> $filename_data['filecomment'],
-		'FILESIZE'		=> $config['max_filesize'])
-	);
-
 	return sizeof($attachment_data);
 }
 
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 923d36c2ac..89cdd5c640 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -1035,11 +1035,11 @@ function compose_pm($id, $mode, $action)
 	// Build custom bbcodes array
 	display_custom_bbcodes();
 
+	// Show attachment box for adding attachments if true
+	$allowed = ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype);
+
 	// Attachment entry
-	if ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype)
-	{
-		posting_gen_attachment_entry($attachment_data, $filename_data);
-	}
+	posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
 
 	// Message History
 	if ($action == 'reply' || $action == 'quote' || $action == 'forward')
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 05dfe5d74d..1ed9e27836 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -35,7 +35,7 @@ class ucp_remind
 
 		if ($submit)
 		{
-			$sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
+			$sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
 				FROM ' . USERS_TABLE . "
 				WHERE user_email = '" . $db->sql_escape($email) . "'
 					AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
@@ -65,6 +65,15 @@ class ucp_remind
 				}
 			}
 
+			// Check users permissions
+			$auth2 = new auth();
+			$auth2->acl($user_row);
+
+			if (!$auth2->acl_get('u_chgpasswd'))
+			{
+				trigger_error('NO_AUTH_PASSWORD_REMINDER');
+			}
+
 			$server_url = generate_board_url();
 
 			$key_len = 54 - strlen($server_url);