11 files changed, 42 insertions, 23 deletions
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
index 5d94787f04..e9d6cb6c51 100644
--- a/phpBB/adm/style/acp_disallow.html
+++ b/phpBB/adm/style/acp_disallow.html
@@ -4,7 +4,7 @@
 
 <h1>{L_ACP_DISALLOW_USERNAMES}</h1>
 
-<p>{L_ADD_DISALLOW_EXPLAIN}</p>
+<p>{L_ACP_DISALLOW_EXPLAIN}</p>
 
 <form id="acp_disallow" method="post" action="{U_ACTION}">
 
diff --git a/phpBB/cron.php b/phpBB/cron.php
index 79cf0f40fa..a4880b119f 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -79,6 +79,12 @@ switch ($cron_type)
 			break;
 		}
 
+		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
+		if ($use_shutdown_function && !$config['smtp_delivery'])
+		{
+			$use_shutdown_function = false;
+		}
+
 		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 		$queue = new queue();
 
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f7765d945b..84a8946e06 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -199,6 +199,8 @@ p a {
 		<li>[Fix] Unable to save email templates through ACP language page (Bug #14266)</li>
 		<li>[Fix] Correctly set user style for guest user (able to be changed within user management)</li>
 		<li>[Change] Moved note about dns_get_record function for using GTalk (Jabber) from Jabber log to Jabber ACP panel</li>
+		<li>[Fix] Do not use register_shutdown_function within cron.php if handling the queue and the mail function being used (Bug #14321)</li>
+		<li>[Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index f0d0520a03..cae06b743d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -329,6 +329,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 	$user_id = (int) $user->data['user_id'];
 
 	$action_ary = $move_into_folder = array();
+	$num_not_moved = $num_removed = 0;
 
 	// Newly processing on-hold messages
 	if ($release)
@@ -384,6 +385,17 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 			$user_new_privmsg = (int) $user->data['user_new_privmsg'];
 		}
 	}
+	else
+	{
+		// If not relasing we need to check the number of not moved messages...
+		$sql = 'SELECT COUNT(msg_id) as num_messages
+			FROM ' . PRIVMSGS_TO_TABLE . "
+			WHERE user_id = $user_id
+				AND folder_id = " . PRIVMSGS_HOLD_BOX;
+		$result = $db->sql_query($sql);
+		$num_not_moved = (int) $db->sql_fetchfield('num_messages');
+		$db->sql_freeresult($result);
+	}
 
 	// Get those messages not yet placed into any box
 	$retrieve_sql = 'SELECT t.*, p.*, u.username, u.user_id, u.group_id
@@ -558,7 +570,6 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 	// Do not change the order of processing
 	// The number of queries needed to be executed here highly depends on the defined rules and are
 	// only gone through if new messages arrive.
-	$num_not_moved = $num_removed = 0;
 
 	// Delete messages
 	if (sizeof($delete_ids))
@@ -619,12 +630,11 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 
 		if (in_array(PRIVMSGS_INBOX, array_keys($move_into_folder)))
 		{
-			$sql = 'SELECT folder_id, COUNT(msg_id) as num_messages
+			$sql = 'SELECT COUNT(msg_id) as num_messages
 				FROM ' . PRIVMSGS_TO_TABLE . "
 				WHERE user_id = $user_id
-					AND folder_id = " . PRIVMSGS_INBOX . "
-				GROUP BY folder_id";
-			$result = $db->sql_query_limit($sql, 1);
+					AND folder_id = " . PRIVMSGS_INBOX;
+			$result = $db->sql_query($sql);
 			$folder[PRIVMSGS_INBOX] = (int) $db->sql_fetchfield('num_messages');
 			$db->sql_freeresult($result);
 		}
@@ -673,11 +683,12 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 				delete_pm($user_id, $delete_ids, $dest_folder);
 			}
 		}
-		
+
 		// 
 		if ($full_folder_action == FULL_FOLDER_HOLD)
 		{
 			$num_not_moved += sizeof($msg_ary);
+			$num_new -= sizeof($msg_ary);
 
 			$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' 
 				SET folder_id = ' . PRIVMSGS_HOLD_BOX . '
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 63660b006d..426b9a9c5b 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -245,10 +245,10 @@ class ucp_pm
 				if ($user->data['user_new_privmsg'] && $action == 'view_folder')
 				{
 					$return = place_pm_into_folder($global_privmsgs_rules, request_var('release', 0));
-					$num_not_moved = $user->data['user_new_privmsg'];
+					$num_not_moved = $return['not_moved'];
 
 					// Make sure num_not_moved is valid.
-					if ($num_not_moved < 0)
+					if ($user->data['user_new_privmsg'] < 0 || $num_not_moved < 0)
 					{
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET user_new_privmsg = 0, user_unread_privmsg = 0
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 2a640ba4fb..1918b6eacf 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -426,7 +426,7 @@ $lang = array_merge($lang, array(
 
 	'JAB_ENABLE'				=> 'Enable Jabber',
 	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
-	'JAB_GTALK_NOTE'			=> 'Please note that using GTalk will not work due to the <samp>dns_get_record</samp> function not found. This function is not available in PHP4 and not implemented on Windows platforms, nor does it (currently) work on *BSD systems.',
+	'JAB_GTALK_NOTE'			=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
 	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
 	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
 	'JAB_PASSWORD'				=> 'Jabber password',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 2f995dc91d..b1f01204fa 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -217,7 +217,7 @@ $lang = array_merge($lang, array(
 
 // Disallow Usernames
 $lang = array_merge($lang, array(
-	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *.  Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
+	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
 	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character.',
 	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index b35e363563..36e4d0e799 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -160,7 +160,7 @@ $lang = array_merge($lang, array(
 	'FILES_REQUIRED_EXPLAIN'	=> '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
 	'FILLING_TABLE'				=> 'Filling table <strong>%s</strong>',
 	'FILLING_TABLES'			=> 'Filling tables',
-	'FINAL_STEP'				=> 'Processing final step',
+	'FINAL_STEP'				=> 'Process final step',
 	'FORUM_ADDRESS'				=> 'Board address',
 	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
 	'FORUM_PATH'				=> 'Board path',
@@ -371,7 +371,7 @@ $lang = array_merge($lang, array(
 	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
 	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
 	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
-	'COLLECTED_INFORMATION'			=> 'Information on collected files',
+	'COLLECTED_INFORMATION'			=> 'File information',
 	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
 	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
 	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
@@ -406,11 +406,11 @@ $lang = array_merge($lang, array(
 	'FILES_MODIFIED'				=> 'Modified files',
 	'FILES_MODIFIED_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
 	'FILES_NEW'						=> 'New files',
-	'FILES_NEW_EXPLAIN'				=> 'The following files currently do not exist within your installation.',
+	'FILES_NEW_EXPLAIN'				=> 'The following files currently do not exist within your installation. These files will be added to your installation.',
 	'FILES_NEW_CONFLICT'			=> 'New conflicting files',
 	'FILES_NEW_CONFLICT_EXPLAIN'	=> 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
 	'FILES_NOT_MODIFIED'			=> 'Not modified files',
-	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files were not modified and represent the original phpBB files from the version you want to update from.',
+	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
 	'FILES_UP_TO_DATE'				=> 'Already updated files',
 	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
 	'FTP_SETTINGS'					=> 'FTP settings',
@@ -556,10 +556,10 @@ $lang = array_merge($lang, array(
 // Default database schema entries...
 $lang = array_merge($lang, array(
 	'CONFIG_BOARD_EMAIL_SIG'		=> 'Thanks, The Management',
-	'CONFIG_SITE_DESC'				=> 'A _little_ text to describe your forum',
+	'CONFIG_SITE_DESC'				=> 'A short text to describe your forum',
 	'CONFIG_SITENAME'				=> 'yourdomain.com',
 
-	'DEFAULT_INSTALL_POST'			=> 'This is an example post in your phpBB3 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!',
+	'DEFAULT_INSTALL_POST'			=> 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
 
 	'EXT_GROUP_ARCHIVES'			=> 'Archives',
 	'EXT_GROUP_DOCUMENTS'			=> 'Documents',
@@ -571,9 +571,9 @@ $lang = array_merge($lang, array(
 	'EXT_GROUP_REAL_MEDIA'			=> 'Real Media',
 	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
 
-	'FORUMS_FIRST_CATEGORY'			=> 'My first Category',
-	'FORUMS_TEST_FORUM_DESC'		=> 'This is just a test forum.',
-	'FORUMS_TEST_FORUM_TITLE'		=> 'Test Forum 1',
+	'FORUMS_FIRST_CATEGORY'			=> 'Your first category',
+	'FORUMS_TEST_FORUM_DESC'		=> 'Description of your first forum.',
+	'FORUMS_TEST_FORUM_TITLE'		=> 'Your first forum',
 
 	'RANKS_SITE_ADMIN_TITLE'		=> 'Site Admin',
 	'REPORT_WAREZ'					=> 'The post contains links to illegal or pirated software.',
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 7962230742..43a31e668d 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -39,7 +39,7 @@
 			<dt>&nbsp;</dt>
 			<dd><a href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
 			<dd><a href="aim:goim?screenname={IM_CONTACT}&amp;message={SITENAME}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aol.co.uk/aim/index.html">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
+			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
 		</dl>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index e45a5d9383..3ec8bac1fb 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -29,7 +29,7 @@
 	<!-- ELSE -->
 		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
 	<!-- ENDIF -->
-		<td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}<br /><br />{L_ONLINE_EXPLAIN}</span></td>
+		<td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}</span></td>
 	</tr>
 	<!-- IF LEGEND -->
 		<tr>
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index 3f6a34ce36..e3c13efd58 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -19,7 +19,7 @@
 
 	<!-- IF S_SEND_AIM -->
 		<tr>
-			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="aim:goim?screenname={IM_CONTACT}&message={SITENAME}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aol.co.uk/aim/index.html">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
+			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="aim:goim?screenname={IM_CONTACT}&message={SITENAME}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">&nbsp;</td>