From 6fce68b9b6f1f47f9f51f8ef1a043b78ac046a3f Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 18 Sep 2011 19:40:04 -0700
Subject: [ticket/9661] Remove eval() from functions_privmsgs.php

Tested by sending messages to myself on a test board.

PHPBB3-9661
---
 phpBB/includes/functions_privmsgs.php | 111 ++++++++++++++++++++++++----------
 1 file changed, 78 insertions(+), 33 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 9787bdfbc4..32b57a9f2e 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -19,7 +19,8 @@ if (!defined('IN_PHPBB'))
 	Ability to simply add own rules by doing three things:
 		1) Add an appropriate constant
 		2) Add a new check array to the global_privmsgs_rules variable and the condition array (if one is required)
-		3) Add a new language variable to ucp.php
+		3) Implement the rule logic in the check_rule() function
+		4) Add a new language variable to ucp.php
 
 		The user is then able to select the new rule. It will be checked against and handled as specified.
 		To add new actions (yes, checks can be added here too) to the rule management, the core code has to be modified.
@@ -57,42 +58,42 @@ define('CHECK_TO', 5);
 */
 $global_privmsgs_rules = array(
 	CHECK_SUBJECT	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'message_subject', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'message_subject', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'message_subject', 'function' => '{CHECK0} != {STRING}'),
-		RULE_BEGINS_WITH	=> array('check0' => 'message_subject', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_ENDS_WITH		=> array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'),
+		RULE_IS_LIKE		=> array('check0' => 'message_subject'),
+		RULE_IS_NOT_LIKE	=> array('check0' => 'message_subject'),
+		RULE_IS				=> array('check0' => 'message_subject'),
+		RULE_IS_NOT			=> array('check0' => 'message_subject'),
+		RULE_BEGINS_WITH	=> array('check0' => 'message_subject'),
+		RULE_ENDS_WITH		=> array('check0' => 'message_subject'),
 	),
 
 	CHECK_SENDER	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'username', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'username', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'username', 'function' => '{CHECK0} != {STRING}'),
-		RULE_BEGINS_WITH	=> array('check0' => 'username', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_ENDS_WITH		=> array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'),
-		RULE_IS_FRIEND		=> array('check0' => 'friend', 'function' => '{CHECK0} == 1'),
-		RULE_IS_FOE			=> array('check0' => 'foe', 'function' => '{CHECK0} == 1'),
-		RULE_IS_USER		=> array('check0' => 'author_id', 'function' => '{CHECK0} == {USER_ID}'),
-		RULE_IS_GROUP		=> array('check0' => 'author_in_group', 'function' => 'in_array({GROUP_ID}, {CHECK0})'),
+		RULE_IS_LIKE		=> array('check0' => 'username'),
+		RULE_IS_NOT_LIKE	=> array('check0' => 'username'),
+		RULE_IS				=> array('check0' => 'username'),
+		RULE_IS_NOT			=> array('check0' => 'username'),
+		RULE_BEGINS_WITH	=> array('check0' => 'username'),
+		RULE_ENDS_WITH		=> array('check0' => 'username'),
+		RULE_IS_FRIEND		=> array('check0' => 'friend'),
+		RULE_IS_FOE			=> array('check0' => 'foe'),
+		RULE_IS_USER		=> array('check0' => 'author_id'),
+		RULE_IS_GROUP		=> array('check0' => 'author_in_group'),
 	),
 
 	CHECK_MESSAGE	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'message_text', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'message_text', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'message_text', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'message_text', 'function' => '{CHECK0} != {STRING}'),
+		RULE_IS_LIKE		=> array('check0' => 'message_text'),
+		RULE_IS_NOT_LIKE	=> array('check0' => 'message_text'),
+		RULE_IS				=> array('check0' => 'message_text'),
+		RULE_IS_NOT			=> array('check0' => 'message_text'),
 	),
 
 	CHECK_STATUS	=> array(
-		RULE_ANSWERED		=> array('check0' => 'pm_replied', 'function' => '{CHECK0} == 1'),
-		RULE_FORWARDED		=> array('check0' => 'pm_forwarded', 'function' => '{CHECK0} == 1'),
+		RULE_ANSWERED		=> array('check0' => 'pm_replied'),
+		RULE_FORWARDED		=> array('check0' => 'pm_forwarded'),
 	),
 
 	CHECK_TO		=> array(
-		RULE_TO_GROUP		=> array('check0' => 'to', 'check1' => 'bcc', 'check2' => 'user_in_group', 'function' => 'in_array("g_" . {CHECK2}, {CHECK0}) || in_array("g_" . {CHECK2}, {CHECK1})'),
-		RULE_TO_ME			=> array('check0' => 'to', 'check1' => 'bcc', 'function' => 'in_array("u_" . $user_id, {CHECK0}) || in_array("u_" . $user_id, {CHECK1})'),
+		RULE_TO_GROUP		=> array('check0' => 'to', 'check1' => 'bcc', 'check2' => 'user_in_group'),
+		RULE_TO_ME			=> array('check0' => 'to', 'check1' => 'bcc'),
 	)
 );
 
@@ -260,16 +261,60 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
 
 	$check_ary = $rules[$rule_row['rule_check']][$rule_row['rule_connection']];
 
-	// Replace Check Literals
-	$evaluate = $check_ary['function'];
-	$evaluate = preg_replace('/{(CHECK[0-9])}/', '$message_row[$check_ary[strtolower("\1")]]', $evaluate);
+	$result = false;
 
-	// Replace Rule Literals
-	$evaluate = preg_replace('/{(STRING|USER_ID|GROUP_ID)}/', '$rule_row["rule_" . strtolower("\1")]', $evaluate);
+	$check0 = $message_row[$check_ary['check0']];
+
+	switch ($rule_row['rule_connection'])
+	{
+		case RULE_IS_LIKE:
+			$result = preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
+		break;
+		
+		case RULE_IS_NOT_LIKE:
+			$result = !preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
+		break;
+		
+		case RULE_IS:
+			$result = ($check0 == $rule_row['rule_string']);
+		break;
+		
+		case RULE_IS_NOT:
+			$result = ($check0 != $rule_row['rule_string']);
+		break;
+		
+		case RULE_BEGINS_WITH:
+			$result = preg_match("/^" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
+		break;
+		
+		case RULE_ENDS_WITH:
+			$result = preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '$/i', $check0);
+		break;
+		
+		case RULE_IS_FRIEND:
+		case RULE_IS_FOE:
+		case RULE_ANSWERED:
+		case RULE_FORWARDED:
+			$result = ($check0 == 1);
+		break;
+		
+		case RULE_IS_USER:
+			$result = ($check0 == $rule_row['rule_user_id']);
+		break;
+		
+		case RULE_IS_GROUP:
+			$result = in_array($rule_row['rule_group_id'], $check0);
+		break;
+		
+		case RULE_TO_GROUP:
+			$result = (in_array('g_' . $message_row[$check_ary['check2']], $check0) || in_array('g_' . $message_row[$check_ary['check2']], $message_row[$check_ary['check1']]));
+		break;
+		
+		case RULE_TO_ME:
+			$result = (in_array('u_' . $user_id, $check0) || in_array('u_' . $user_id, $message_row[$check_ary['check1']]));
+		break;
+	}
 
-	// Evil Statement
-	$result = false;
-	eval('$result = (' . $evaluate . ') ? true : false;');
 
 	if (!$result)
 	{
-- 
cgit v1.2.1


From f7c1341402ea47cc33ac183421485db3efd7ea15 Mon Sep 17 00:00:00 2001
From: Alan <asinshesq@code.phpbb.com>
Date: Thu, 13 Oct 2011 19:17:56 +0200
Subject: [ticket/8616] Direct links in pm notification emails

Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4c34bc92ca..a857109466 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1607,7 +1607,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	// Send Notifications
 	if ($mode != 'edit')
 	{
-		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']);
+		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
 	}
 
 	return $data['msg_id'];
@@ -1616,7 +1616,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 /**
 * PM Notification
 */
-function pm_notification($mode, $author, $recipients, $subject, $message)
+function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
 {
 	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
 
@@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message)
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox")
+			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
 		);
 
 		$messenger->send($addr['method']);
-- 
cgit v1.2.1


From 39f6d583150bcd25ff7a780686ebd9c5d933b99e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 19:28:46 +0200
Subject: [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE

PHPBB3-8616
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index a857109466..b34b742d57 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
+			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
 		);
 
 		$messenger->send($addr['method']);
-- 
cgit v1.2.1


From 2b3effb13c0f1d8322653147e5dcbc20ae36b418 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 11 Nov 2011 22:32:59 +0100
Subject: [ticket/8616] Include old U_INBOX var for BC

PHPBB3-8616
---
 phpBB/includes/functions_privmsgs.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index b34b742d57..c40ceb088f 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1688,8 +1688,9 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
-		);
+			'U_INBOX'			=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox",
+			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id",
+		));
 
 		$messenger->send($addr['method']);
 	}
-- 
cgit v1.2.1


From 88ae40a4b19360645d5e5a614cc378e7cce4afe3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Sep 2011 00:28:52 +0200
Subject: [ticket/10345] Make use of the plural function in some basic places

PHPBB3-10345
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d90e321285..76f25da977 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1330,7 +1330,7 @@ function get_folder_status($folder_id, $folder)
 		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
 	);
 
-	$return['message']	= sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']);
+	$return['message']	= $user->lang('FOLDER_STATUS_MSG', (int) $return['max'], $return['cur'], $return['percent']);
 
 	return $return;
 }
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/includes/functions_privmsgs.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 76f25da977..91e453b8e0 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1


From 17f5c6bf71f560be2f4e2ecabae83ab2973bec47 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 18 Feb 2012 12:00:12 +0100
Subject: [ticket/10605] Check for orphan privmsgs when deleting a user

Also moved the hole code into a new function.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 116 ++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c40ceb088f..30cff8ed72 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1083,6 +1083,122 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 	return true;
 }
 
+/**
+* Delete all PM(s) for a given user and delete the ones without references
+*/
+function delete_user_pms($user_id)
+{
+	global $db, $user, $phpbb_root_path, $phpEx;
+
+	$user_id = (int) $user_id;
+
+	if (!$user_id)
+	{
+		return false;
+	}
+
+	// Get PM Information for later deleting
+	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE user_id = ' . $user_id . '
+			OR (author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
+	$result = $db->sql_query($sql);
+
+	$undelivered_msg = $undelivered_user = $delete_rows = array();
+	$num_unread = $num_new = $num_deleted = 0;
+	while ($row = $db->sql_fetchrow($result))
+	{
+		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
+		{
+			// Undelivered messages
+			$undelivered_msg[] = $row['msg_id'];
+			$undelivered_user[$row['user_id']][] = true;
+		}
+
+		$delete_rows[$row['msg_id']] = 1;
+	}
+	$db->sql_freeresult($result);
+
+	if (!sizeof($delete_rows))
+	{
+		return false;
+	}
+
+	$db->sql_transaction('begin');
+
+	if (sizeof($undelivered_msg))
+	{
+		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+			WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+		$db->sql_query($sql);
+	}
+
+	foreach ($undelivered_user as $_user_id => $ary)
+	{
+		if ($_user_id == $user_id)
+		{
+			continue;
+		}
+
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
+				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
+			WHERE user_id = ' . $_user_id;
+		$db->sql_query($sql);
+	}
+
+	// Delete private message data
+	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
+		WHERE user_id = $user_id
+			AND " . $db->sql_in_set('msg_id', array_keys($delete_rows));
+	$db->sql_query($sql);
+
+	// Now we have to check which messages we can delete completely
+	$sql = 'SELECT msg_id
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows));
+	$result = $db->sql_query($sql);
+
+	while ($row = $db->sql_fetchrow($result))
+	{
+		unset($delete_rows[$row['msg_id']]);
+	}
+	$db->sql_freeresult($result);
+
+	$delete_ids = array_keys($delete_rows);
+
+	if (sizeof($delete_ids))
+	{
+		// Check if there are any attachments we need to remove
+		if (!function_exists('delete_attachments'))
+		{
+			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+		}
+
+		delete_attachments('message', $delete_ids, false);
+
+		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+		$db->sql_query($sql);
+	}
+
+	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
+	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
+		SET author_id = ' . ANONYMOUS . '
+		WHERE author_id = ' . $user_id;
+	$db->sql_query($sql);
+
+	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
+		SET author_id = ' . ANONYMOUS . '
+		WHERE author_id = ' . $user_id;
+	$db->sql_query($sql);
+
+	$db->sql_transaction('commit');
+
+	return true;
+}
+
 /**
 * Rebuild message header
 */
-- 
cgit v1.2.1


From 321d0d9b56011e049b245b6d54975b6c67b3b15b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:44:00 +0800
Subject: [ticket/10684] Adjust pm_notifications() to handle stale bans

- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
---
 phpBB/includes/functions_privmsgs.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c40ceb088f..8303fc3754 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1622,6 +1622,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 
 	$subject = censor_text($subject);
 
+	// Exclude guests, current user and banned users from notifications
 	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
 
 	if (!sizeof($recipients))
@@ -1629,18 +1630,12 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		return;
 	}
 
-	// Get banned User ID's
-	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ' . $db->sql_in_set('ban_userid', array_map('intval', array_keys($recipients))) . '
-			AND ban_exclude = 0';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
+	if (!function_exists('phpbb_get_banned_users_ids'))
 	{
-		unset($recipients[$row['ban_userid']]);
+		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$db->sql_freeresult($result);
+	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
+	$recipients = array_diff(array_map('intval', array_keys($recipients)), $banned_users);
 
 	if (!sizeof($recipients))
 	{
@@ -1649,7 +1644,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 
 	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
 		FROM ' . USERS_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', array_map('intval', array_keys($recipients)));
+		WHERE ' . $db->sql_in_set('user_id', $recipients);
 	$result = $db->sql_query($sql);
 
 	$msg_list_ary = array();
-- 
cgit v1.2.1


From da395edbca3e25d1758a6b8c26d14c2e48f112d9 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:47:28 +0800
Subject: [ticket/10684] Remove intval mapping for array keys

PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8303fc3754..4ea8f74153 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1635,7 +1635,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
 	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
-	$recipients = array_diff(array_map('intval', array_keys($recipients)), $banned_users);
+	$recipients = array_diff(array_keys($recipients), $banned_users);
 
 	if (!sizeof($recipients))
 	{
-- 
cgit v1.2.1


From ba6943a6a0ea50af772dc6e94f13b56292cd9f37 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 Mar 2012 10:11:52 +0100
Subject: [ticket/10605] Prefix function with phpbb_ and use true instead of 1

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 30cff8ed72..34f16ea9da 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1086,7 +1086,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 /**
 * Delete all PM(s) for a given user and delete the ones without references
 */
-function delete_user_pms($user_id)
+function phpbb_delete_user_pms($user_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
 
@@ -1116,7 +1116,7 @@ function delete_user_pms($user_id)
 			$undelivered_user[$row['user_id']][] = true;
 		}
 
-		$delete_rows[$row['msg_id']] = 1;
+		$delete_rows[$row['msg_id']] = true;
 	}
 	$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From 5a9dd1994fc20aaebe3145540b630826d7333998 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 22 Mar 2012 21:19:01 +0800
Subject: [ticket/10684] Adjust function and parameter name, minor changes.

PHPBB3-10684
---
 phpBB/includes/functions_privmsgs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4ea8f74153..447920cfd5 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1630,11 +1630,11 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		return;
 	}
 
-	if (!function_exists('phpbb_get_banned_users_ids'))
+	if (!function_exists('phpbb_get_banned_user_ids'))
 	{
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
+	$banned_users = phpbb_get_banned_user_ids(array_keys($recipients));
 	$recipients = array_diff(array_keys($recipients), $banned_users);
 
 	if (!sizeof($recipients))
-- 
cgit v1.2.1


From e8830f605f73a0c8fa5c3ea579ee18f295b81600 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:18:02 +0200
Subject: [ticket/10605] Use unset() instead of checking user_id over and over
 again.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 34f16ea9da..59dea50094 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1134,13 +1134,9 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
+	unset($undelivered_user[$user_id]);
 	foreach ($undelivered_user as $_user_id => $ary)
 	{
-		if ($_user_id == $user_id)
-		{
-			continue;
-		}
-
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
 				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
-- 
cgit v1.2.1


From 2203bc204e55c33e2e9b212eeb0c7bf2e3060851 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:29:29 +0200
Subject: [ticket/10605] Turn $undelivered_user into a real array of counters.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 59dea50094..352bd4d15d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1113,7 +1113,15 @@ function phpbb_delete_user_pms($user_id)
 		{
 			// Undelivered messages
 			$undelivered_msg[] = $row['msg_id'];
-			$undelivered_user[$row['user_id']][] = true;
+
+			if (isset($undelivered_user[$row['user_id']]))
+			{
+				++$undelivered_user[$row['user_id']];
+			}
+			else
+			{
+				$undelivered_user[$row['user_id']] = 1;
+			}
 		}
 
 		$delete_rows[$row['msg_id']] = true;
@@ -1135,11 +1143,11 @@ function phpbb_delete_user_pms($user_id)
 	}
 
 	unset($undelivered_user[$user_id]);
-	foreach ($undelivered_user as $_user_id => $ary)
+	foreach ($undelivered_user as $_user_id => $count)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
-				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
+			SET user_new_privmsg = user_new_privmsg - ' . $count . ',
+				user_unread_privmsg = user_unread_privmsg - ' . $count . '
 			WHERE user_id = ' . $_user_id;
 		$db->sql_query($sql);
 	}
-- 
cgit v1.2.1


From dbc7a69ad2bf6b062a4d7a40d62be29a410b5c18 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:30:52 +0200
Subject: [ticket/10605] Remove unused variable declarations.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 352bd4d15d..4ff0c53420 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1106,7 +1106,6 @@ function phpbb_delete_user_pms($user_id)
 	$result = $db->sql_query($sql);
 
 	$undelivered_msg = $undelivered_user = $delete_rows = array();
-	$num_unread = $num_new = $num_deleted = 0;
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-- 
cgit v1.2.1


From 9040f18d7cf9de137acbac6072dc2ffd3cede1b5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:35:01 +0200
Subject: [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4ff0c53420..00029a1986 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1123,7 +1123,7 @@ function phpbb_delete_user_pms($user_id)
 			}
 		}
 
-		$delete_rows[$row['msg_id']] = true;
+		$delete_rows[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
@@ -1154,13 +1154,13 @@ function phpbb_delete_user_pms($user_id)
 	// Delete private message data
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
 		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', array_keys($delete_rows));
+			AND " . $db->sql_in_set('msg_id', $delete_rows);
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows));
+		WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From dd53d0576d8256e37074cc23dd5b9769acc12d1a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:39:49 +0200
Subject: [ticket/10605] Remove unnecessary $delete_ids array.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 00029a1986..23f582641b 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1169,9 +1169,7 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	$delete_ids = array_keys($delete_rows);
-
-	if (sizeof($delete_ids))
+	if (!empty($delete_rows))
 	{
 		// Check if there are any attachments we need to remove
 		if (!function_exists('delete_attachments'))
@@ -1179,10 +1177,10 @@ function phpbb_delete_user_pms($user_id)
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
 
-		delete_attachments('message', $delete_ids, false);
+		delete_attachments('message', $delete_rows, false);
 
 		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+			WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
 		$db->sql_query($sql);
 	}
 
-- 
cgit v1.2.1


From ad073d22b9e543d5842af7b8ef94fe7e6b443504 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:43:09 +0200
Subject: [ticket/10605] Break long comment into multiple lines 80 chars short.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 23f582641b..e7beae3fab 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1184,7 +1184,8 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
+	// Set the remaining author id to anonymous
+	// This way users are still able to read messages from users being removed
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
 		SET author_id = ' . ANONYMOUS . '
 		WHERE author_id = ' . $user_id;
-- 
cgit v1.2.1


From 9c8aab4d32a001ae66fe005b7124737fc5ad7dd6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 02:02:17 +0200
Subject: [ticket/10605] Rename $delete_rows to $delete_ids.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index e7beae3fab..576da4d439 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1105,7 +1105,7 @@ function phpbb_delete_user_pms($user_id)
 				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
 	$result = $db->sql_query($sql);
 
-	$undelivered_msg = $undelivered_user = $delete_rows = array();
+	$undelivered_msg = $undelivered_user = $delete_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
@@ -1123,11 +1123,11 @@ function phpbb_delete_user_pms($user_id)
 			}
 		}
 
-		$delete_rows[(int) $row['msg_id']] = (int) $row['msg_id'];
+		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
-	if (!sizeof($delete_rows))
+	if (empty($delete_ids))
 	{
 		return false;
 	}
@@ -1154,22 +1154,22 @@ function phpbb_delete_user_pms($user_id)
 	// Delete private message data
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
 		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', $delete_rows);
+			AND " . $db->sql_in_set('msg_id', $delete_ids);
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
+		WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		unset($delete_rows[$row['msg_id']]);
+		unset($delete_ids[$row['msg_id']]);
 	}
 	$db->sql_freeresult($result);
 
-	if (!empty($delete_rows))
+	if (!empty($delete_ids))
 	{
 		// Check if there are any attachments we need to remove
 		if (!function_exists('delete_attachments'))
@@ -1177,10 +1177,10 @@ function phpbb_delete_user_pms($user_id)
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
 
-		delete_attachments('message', $delete_rows, false);
+		delete_attachments('message', $delete_ids, false);
 
 		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
+			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 		$db->sql_query($sql);
 	}
 
-- 
cgit v1.2.1


From 0397b462174887bda3fea4bcebf9a26f6b591a3e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 27 Mar 2012 17:29:03 +0200
Subject: [ticket/10605] Split query to be able to use indexes

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 576da4d439..dd81e8f92d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1098,11 +1098,11 @@ function phpbb_delete_user_pms($user_id)
 	}
 
 	// Get PM Information for later deleting
+	// The two queries where split, so we can use our indexes
+	// Part 1: get PMs the user received
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user_id . '
-			OR (author_id = ' . $user_id . '
-				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
+		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
 
 	$undelivered_msg = $undelivered_user = $delete_ids = array();
@@ -1127,6 +1127,34 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
+	// Part 2: get PMs the user sent
+	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX;
+	$result = $db->sql_query($sql);
+
+	while ($row = $db->sql_fetchrow($result))
+	{
+		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
+		{
+			// Undelivered messages
+			$undelivered_msg[] = $row['msg_id'];
+
+			if (isset($undelivered_user[$row['user_id']]))
+			{
+				++$undelivered_user[$row['user_id']];
+			}
+			else
+			{
+				$undelivered_user[$row['user_id']] = 1;
+			}
+		}
+
+		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
+	}
+	$db->sql_freeresult($result);
+
 	if (empty($delete_ids))
 	{
 		return false;
-- 
cgit v1.2.1


From b9324577aca6f7f7632b609e975e510e25d8ec86 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 27 Mar 2012 17:32:55 +0200
Subject: =?UTF-8?q?[ticket/10605]=20Reset=20user=C2=B4s=20pm=20count=20to?=
 =?UTF-8?q?=200=20when=20deleting=20his=20PMs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index dd81e8f92d..14a6d83b2a 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1169,7 +1169,17 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	unset($undelivered_user[$user_id]);
+	// Reset the userīs pm count to 0
+	if (isset($undelivered_user[$user_id]))
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_new_privmsg = 0,
+				user_unread_privmsg = 0
+			WHERE user_id = ' . $user_id;
+		$db->sql_query($sql);
+		unset($undelivered_user[$user_id]);
+	}
+
 	foreach ($undelivered_user as $_user_id => $count)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
-- 
cgit v1.2.1


From 9236dd4c471a6f7655bd00ae422a13013a400ac4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 02:54:39 +0200
Subject: [feature/class-prefix] Rename auth => phpbb_auth

PHPBB3-10609
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index a6fb87536a..434349714b 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -343,7 +343,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
 			$userdata = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			$auth2 = new auth();
+			$auth2 = new phpbb_auth();
 			$auth2->acl($userdata);
 
 			if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_'))
-- 
cgit v1.2.1


From 4b6b41a1e5cb3d4ba7c896dfa4d72082aa2f069e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 13 Apr 2012 16:26:41 +0200
Subject: [ticket/10605] Add parameter documentation to phpbb_delete_user_pms

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 14a6d83b2a..00bec11569 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1085,6 +1085,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 
 /**
 * Delete all PM(s) for a given user and delete the ones without references
+*
+* @param	int		$user_id	ID of the user whose private messages we want to delete
+*
+* @return	boolean		False if there were no pms found, true otherwise.
 */
 function phpbb_delete_user_pms($user_id)
 {
-- 
cgit v1.2.1


From ee875c0a43ac734d1693cdd7393c8f4277233426 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 02:24:31 +0200
Subject: [ticket/10790] Remove a (kind of) dead code section from submit_pm().

The type of $user->data['user_id'] is (almost) guranteed to be integer
since session::session_create() casts it to integer.
The type of $row['user_id'] is only an integer if the DB driver adjusts the
PHP type according to the DB type. This is only done by some of our
not-so-popular DB drivers and is not the case for MySQL.

As such this comparison is (almost) never true and a PM is also sent to the
author itself when it is sent to a group the author is also a member of.

Since this behaviour seems to have been accepted by the communty, the dead
code is removed and current behaviour is kept.

Also, checking this in the loop seems to be a rather bad idea.

Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68.

PHPBB3-10790
---
 phpBB/includes/functions_privmsgs.php | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d2fce000aa..261ed45727 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1522,12 +1522,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				// Additionally, do not include the sender if he is in the group he wants to send to. ;)
-				if ($row['user_id'] === $user->data['user_id'])
-				{
-					continue;
-				}
-
 				$field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc';
 				$recipients[$row['user_id']] = $field;
 			}
-- 
cgit v1.2.1


From ac8ebfabc7a4fae591ac780f621e4e21d09d070c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:26:48 +0200
Subject: [ticket/10950] Use proper ' in order to fix comment.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 261ed45727..e6e8e0ab6c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1173,7 +1173,7 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	// Reset the userīs pm count to 0
+	// Reset the user's pm count to 0
 	if (isset($undelivered_user[$user_id]))
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
-- 
cgit v1.2.1


From 35b18676cda35b81277a9532ac9a579abbfda09d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:28:13 +0200
Subject: [ticket/10950] Fix SQL coding style (indentation) in second SQL
 query.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index e6e8e0ab6c..d76efd2ff6 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1135,7 +1135,7 @@ function phpbb_delete_user_pms($user_id)
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
-				AND folder_id = ' . PRIVMSGS_NO_BOX;
+			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:30:09 +0200
Subject: [ticket/10950] Remove redundant if statement.

We already know author_id and folder_id.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d76efd2ff6..d75b4d92a8 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1140,19 +1140,16 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-		{
-			// Undelivered messages
-			$undelivered_msg[] = $row['msg_id'];
+		// Undelivered messages
+		$undelivered_msg[] = $row['msg_id'];
 
-			if (isset($undelivered_user[$row['user_id']]))
-			{
-				++$undelivered_user[$row['user_id']];
-			}
-			else
-			{
-				$undelivered_user[$row['user_id']] = 1;
-			}
+		if (isset($undelivered_user[$row['user_id']]))
+		{
+			++$undelivered_user[$row['user_id']];
+		}
+		else
+		{
+			$undelivered_user[$row['user_id']] = 1;
 		}
 
 		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
-- 
cgit v1.2.1


From a50d1a3576b9e92dfbcfc5bb951e2985ae1872a1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:32:16 +0200
Subject: [ticket/10950] Move array initialisation to the front.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d75b4d92a8..cdfde4c7ea 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1103,13 +1103,14 @@ function phpbb_delete_user_pms($user_id)
 
 	// Get PM Information for later deleting
 	// The two queries where split, so we can use our indexes
+	$undelivered_msg = $undelivered_user = $delete_ids = array();
+
 	// Part 1: get PMs the user received
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
 
-	$undelivered_msg = $undelivered_user = $delete_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-- 
cgit v1.2.1


From 9c2930178f37ed881055da3e65286704a3a8220e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:43:43 +0200
Subject: [ticket/10950] Use a variable for the private message id.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index cdfde4c7ea..d77d46d46d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1113,10 +1113,13 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
+		$msg_id = (int) $row['msg_id'];
+		$delete_ids[$msg_id] = $msg_id;
+
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
 		{
 			// Undelivered messages
-			$undelivered_msg[] = $row['msg_id'];
+			$undelivered_msg[] = $msg_id;
 
 			if (isset($undelivered_user[$row['user_id']]))
 			{
@@ -1127,8 +1130,6 @@ function phpbb_delete_user_pms($user_id)
 				$undelivered_user[$row['user_id']] = 1;
 			}
 		}
-
-		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
@@ -1141,8 +1142,11 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
+		$msg_id = (int) $row['msg_id'];
+		$delete_ids[$msg_id] = $msg_id;
+
 		// Undelivered messages
-		$undelivered_msg[] = $row['msg_id'];
+		$undelivered_msg[] = $msg_id;
 
 		if (isset($undelivered_user[$row['user_id']]))
 		{
@@ -1152,8 +1156,6 @@ function phpbb_delete_user_pms($user_id)
 		{
 			$undelivered_user[$row['user_id']] = 1;
 		}
-
-		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From fce385e5bc1212d9c3233b7a1ae2212eb1626e9b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:45:36 +0200
Subject: [ticket/10950] Select the correct columns in SQL queries.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d77d46d46d..1800242b71 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1106,7 +1106,7 @@ function phpbb_delete_user_pms($user_id)
 	$undelivered_msg = $undelivered_user = $delete_ids = array();
 
 	// Part 1: get PMs the user received
-	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+	$sql = 'SELECT msg_id, user_id, author_id, folder_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
@@ -1134,7 +1134,7 @@ function phpbb_delete_user_pms($user_id)
 	$db->sql_freeresult($result);
 
 	// Part 2: get PMs the user sent
-	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
-- 
cgit v1.2.1


From 30475856c46b3604693b6d5df22be3360ae16822 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:47:26 +0200
Subject: [ticket/10950] Add empty line to make unset() call more visible.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 1800242b71..72dd3c7d20 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1181,6 +1181,7 @@ function phpbb_delete_user_pms($user_id)
 				user_unread_privmsg = 0
 			WHERE user_id = ' . $user_id;
 		$db->sql_query($sql);
+
 		unset($undelivered_user[$user_id]);
 	}
 
-- 
cgit v1.2.1


From 49afc1f2dc3a3ee17c6abff1e94c25a8ba8b3604 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 11:16:38 +0200
Subject: [ticket/10950] Correct comment for the second query.

Only undelivered messages are handled.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 72dd3c7d20..afd254d6ea 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1133,7 +1133,7 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	// Part 2: get PMs the user sent
+	// Part 2: get PMs the user sent, but has yet to be received
 	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
-- 
cgit v1.2.1


From 5c8c7b1352454fc8d1bb6e689d52d31b346d5fdb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 13:10:15 +0200
Subject: [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()

- Get delete_ids, pms of the user as receipt
- Get undelivered_msg, pms of the user as sender
- Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links
- Correct the _new and _unread user values for the receipts
- Delete delete_ids, if there are no links to them anymore
- Reset _new and _unread values for the user we delete

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 132 +++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 58 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index afd254d6ea..88388841ed 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1103,10 +1103,10 @@ function phpbb_delete_user_pms($user_id)
 
 	// Get PM Information for later deleting
 	// The two queries where split, so we can use our indexes
-	$undelivered_msg = $undelivered_user = $delete_ids = array();
+	$undelivered_msg = $delete_ids = array();
 
 	// Part 1: get PMs the user received
-	$sql = 'SELECT msg_id, user_id, author_id, folder_id
+	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
@@ -1115,26 +1115,13 @@ function phpbb_delete_user_pms($user_id)
 	{
 		$msg_id = (int) $row['msg_id'];
 		$delete_ids[$msg_id] = $msg_id;
-
-		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-		{
-			// Undelivered messages
-			$undelivered_msg[] = $msg_id;
-
-			if (isset($undelivered_user[$row['user_id']]))
-			{
-				++$undelivered_user[$row['user_id']];
-			}
-			else
-			{
-				$undelivered_user[$row['user_id']] = 1;
-			}
-		}
 	}
 	$db->sql_freeresult($result);
 
 	// Part 2: get PMs the user sent, but has yet to be received
-	$sql = 'SELECT msg_id, user_id
+	// We can not simply delete them. First we have to check,
+	// whether another user already received and read the message.
+	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
@@ -1143,61 +1130,90 @@ function phpbb_delete_user_pms($user_id)
 	while ($row = $db->sql_fetchrow($result))
 	{
 		$msg_id = (int) $row['msg_id'];
-		$delete_ids[$msg_id] = $msg_id;
-
-		// Undelivered messages
-		$undelivered_msg[] = $msg_id;
-
-		if (isset($undelivered_user[$row['user_id']]))
-		{
-			++$undelivered_user[$row['user_id']];
-		}
-		else
-		{
-			$undelivered_user[$row['user_id']] = 1;
-		}
+		$undelivered_msg[$msg_id] = $msg_id;
 	}
 	$db->sql_freeresult($result);
 
-	if (empty($delete_ids))
+	if (empty($delete_ids) && empty($undelivered_msg))
 	{
 		return false;
 	}
 
 	$db->sql_transaction('begin');
 
-	if (sizeof($undelivered_msg))
+	if (!empty($undelivered_msg))
 	{
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
-		$db->sql_query($sql);
-	}
+		// A pm is not undelivered, if for any receipt the message was moved
+		// from their NO_BOX to another folder.
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TO_TABLE . '
+			WHERE author_id = ' . $user_id . '
+				AND folder_id <> ' . PRIVMSGS_NO_BOX . '
+				AND folder_id <> ' . PRIVMSGS_OUTBOX . '
+				AND folder_id <> ' . PRIVMSGS_SENTBOX;
+		$result = $db->sql_query($sql);
 
-	// Reset the user's pm count to 0
-	if (isset($undelivered_user[$user_id]))
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = 0,
-				user_unread_privmsg = 0
-			WHERE user_id = ' . $user_id;
-		$db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$msg_id = (int) $row['msg_id'];
+			unset($undelivered_msg[$msg_id]);
+		}
+		$db->sql_freeresult($result);
 
-		unset($undelivered_user[$user_id]);
-	}
+		if (!empty($undelivered_msg))
+		{
+			$undelivered_user = array();
 
-	foreach ($undelivered_user as $_user_id => $count)
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . $count . ',
-				user_unread_privmsg = user_unread_privmsg - ' . $count . '
-			WHERE user_id = ' . $_user_id;
-		$db->sql_query($sql);
+			// Count the messages we delete, so we can correct the user pm data
+			$sql = 'SELECT user_id
+				FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE author_id = ' . $user_id . '
+					AND folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				if (isset($undelivered_user[$row['user_id']]))
+				{
+					++$undelivered_user[$row['user_id']];
+				}
+				else
+				{
+					$undelivered_user[$row['user_id']] = 1;
+				}
+			}
+			$db->sql_freeresult($result);
+
+			foreach ($undelivered_user as $undelivered_user_id => $count)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_new_privmsg = user_new_privmsg - ' . $count . ',
+						user_unread_privmsg = user_unread_privmsg - ' . $count . '
+					WHERE user_id = ' . $undelivered_user_id;
+				$db->sql_query($sql);
+			}
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$db->sql_query($sql);
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$db->sql_query($sql);
+		}
 	}
 
-	// Delete private message data
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
-		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', $delete_ids);
+	// Reset the user's pm count to 0
+	$sql = 'UPDATE ' . USERS_TABLE . '
+		SET user_new_privmsg = 0,
+			user_unread_privmsg = 0
+		WHERE user_id = ' . $user_id;
+	$db->sql_query($sql);
+
+	// Delete private message data of the user
+	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE user_id = ' . (int) $user_id;
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely
-- 
cgit v1.2.1


From 338d29072fd5581968f404576c6faa2dffc4f883 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 13:14:19 +0200
Subject: [ticket/10950] Check $delete_ids to be not empty

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 41 +++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 88388841ed..6c0adccbed 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1216,31 +1216,34 @@ function phpbb_delete_user_pms($user_id)
 		WHERE user_id = ' . (int) $user_id;
 	$db->sql_query($sql);
 
-	// Now we have to check which messages we can delete completely
-	$sql = 'SELECT msg_id
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		unset($delete_ids[$row['msg_id']]);
-	}
-	$db->sql_freeresult($result);
-
 	if (!empty($delete_ids))
 	{
-		// Check if there are any attachments we need to remove
-		if (!function_exists('delete_attachments'))
+		// Now we have to check which messages we can delete completely
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TO_TABLE . '
+			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
 		{
-			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+			unset($delete_ids[$row['msg_id']]);
 		}
+		$db->sql_freeresult($result);
 
-		delete_attachments('message', $delete_ids, false);
+		if (!empty($delete_ids))
+		{
+			// Check if there are any attachments we need to remove
+			if (!function_exists('delete_attachments'))
+			{
+				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+			}
 
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
-		$db->sql_query($sql);
+			delete_attachments('message', $delete_ids, false);
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+			$db->sql_query($sql);
+		}
 	}
 
 	// Set the remaining author id to anonymous
-- 
cgit v1.2.1


From e68c1fb9e4d5de214c1e483531706ec300ffdb0d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 11 Jul 2012 12:58:57 +0200
Subject: [ticket/10950] Use database count() and group by instead of doing
 that in php

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 6c0adccbed..1d45961ac4 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1143,7 +1143,7 @@ function phpbb_delete_user_pms($user_id)
 
 	if (!empty($undelivered_msg))
 	{
-		// A pm is not undelivered, if for any receipt the message was moved
+		// A pm is delivered, if for any receipt the message was moved
 		// from their NO_BOX to another folder.
 		$sql = 'SELECT msg_id
 			FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1165,23 +1165,17 @@ function phpbb_delete_user_pms($user_id)
 			$undelivered_user = array();
 
 			// Count the messages we delete, so we can correct the user pm data
-			$sql = 'SELECT user_id
+			$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
 				FROM ' . PRIVMSGS_TO_TABLE . '
 				WHERE author_id = ' . $user_id . '
 					AND folder_id = ' . PRIVMSGS_NO_BOX . '
-					AND ' . $db->sql_in_set('msg_id', $undelivered_msg);
+					AND ' . $db->sql_in_set('msg_id', $undelivered_msg) . '
+				GROUP BY user_id';
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				if (isset($undelivered_user[$row['user_id']]))
-				{
-					++$undelivered_user[$row['user_id']];
-				}
-				else
-				{
-					$undelivered_user[$row['user_id']] = 1;
-				}
+				$undelivered_user[$row['user_id']] = (int) $row['num_undelivered_privmsgs'];
 			}
 			$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From d9a32ce6143be27b8414072694c969fa16b5329a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 16 Jul 2012 17:22:10 +0200
Subject: [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for
 each user

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 1d45961ac4..82344d1787 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1175,16 +1175,29 @@ function phpbb_delete_user_pms($user_id)
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$undelivered_user[$row['user_id']] = (int) $row['num_undelivered_privmsgs'];
+				$num_pms = (int) $row['num_undelivered_privmsgs'];
+				$undelivered_user[$num_pms][] = (int) $row['user_id'];
+
+				if (sizeof($undelivered_user[$num_pms]) > 50)
+				{
+					// If there are too many users affected the query might get
+					// too long, so we update the value for the first bunch here.
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+							user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+						WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
+					$db->sql_query($sql);
+					unset($undelivered_user[$num_pms]);
+				}
 			}
 			$db->sql_freeresult($result);
 
-			foreach ($undelivered_user as $undelivered_user_id => $count)
+			foreach ($undelivered_user as $num_pms => $undelivered_user_set)
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_new_privmsg = user_new_privmsg - ' . $count . ',
-						user_unread_privmsg = user_unread_privmsg - ' . $count . '
-					WHERE user_id = ' . $undelivered_user_id;
+					SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+						user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+					WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
 				$db->sql_query($sql);
 			}
 
-- 
cgit v1.2.1


From a3517232f943fd8070c98a78f2cf731339b76a74 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jul 2012 16:13:08 +0200
Subject: [ticket/10950] Delete PMs for users that have not yet read the pm

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 76 ++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 32 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 82344d1787..0890f057d2 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1144,7 +1144,9 @@ function phpbb_delete_user_pms($user_id)
 	if (!empty($undelivered_msg))
 	{
 		// A pm is delivered, if for any receipt the message was moved
-		// from their NO_BOX to another folder.
+		// from their NO_BOX to another folder. We do not delete such
+		// messages, but only delete them for users, who have not yet
+		// received them.
 		$sql = 'SELECT msg_id
 			FROM ' . PRIVMSGS_TO_TABLE . '
 			WHERE author_id = ' . $user_id . '
@@ -1153,54 +1155,64 @@ function phpbb_delete_user_pms($user_id)
 				AND folder_id <> ' . PRIVMSGS_SENTBOX;
 		$result = $db->sql_query($sql);
 
+		$delivered_msg = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$msg_id = (int) $row['msg_id'];
+			$delivered_msg[$msg_id] = $msg_id;
 			unset($undelivered_msg[$msg_id]);
 		}
 		$db->sql_freeresult($result);
 
-		if (!empty($undelivered_msg))
-		{
-			$undelivered_user = array();
-
-			// Count the messages we delete, so we can correct the user pm data
-			$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
-				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE author_id = ' . $user_id . '
-					AND folder_id = ' . PRIVMSGS_NO_BOX . '
-					AND ' . $db->sql_in_set('msg_id', $undelivered_msg) . '
-				GROUP BY user_id';
-			$result = $db->sql_query($sql);
+		$undelivered_user = array();
 
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$num_pms = (int) $row['num_undelivered_privmsgs'];
-				$undelivered_user[$num_pms][] = (int) $row['user_id'];
+		// Count the messages we delete, so we can correct the user pm data
+		$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
+			FROM ' . PRIVMSGS_TO_TABLE . '
+			WHERE author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', array_merge($undelivered_msg, $delivered_msg)) . '
+			GROUP BY user_id';
+		$result = $db->sql_query($sql);
 
-				if (sizeof($undelivered_user[$num_pms]) > 50)
-				{
-					// If there are too many users affected the query might get
-					// too long, so we update the value for the first bunch here.
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
-							user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
-						WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
-					$db->sql_query($sql);
-					unset($undelivered_user[$num_pms]);
-				}
-			}
-			$db->sql_freeresult($result);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$num_pms = (int) $row['num_undelivered_privmsgs'];
+			$undelivered_user[$num_pms][] = (int) $row['user_id'];
 
-			foreach ($undelivered_user as $num_pms => $undelivered_user_set)
+			if (sizeof($undelivered_user[$num_pms]) > 50)
 			{
+				// If there are too many users affected the query might get
+				// too long, so we update the value for the first bunch here.
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
 						user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
-					WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
+					WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
 				$db->sql_query($sql);
+				unset($undelivered_user[$num_pms]);
 			}
+		}
+		$db->sql_freeresult($result);
+
+		foreach ($undelivered_user as $num_pms => $undelivered_user_set)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+					user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+				WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
+			$db->sql_query($sql);
+		}
 
+		if (!empty($delivered_msg))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
+			$db->sql_query($sql);
+		}
+
+		if (!empty($undelivered_msg))
+		{
 			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
-- 
cgit v1.2.1


From 3036db481a40a395f9021b991dd3d659649ec831 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jul 2012 18:01:06 +0200
Subject: [ticket/10950] Fix grammar in comments

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 0890f057d2..b08d6e7f5c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1118,8 +1118,8 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	// Part 2: get PMs the user sent, but has yet to be received
-	// We can not simply delete them. First we have to check,
+	// Part 2: get PMs the user sent, but have yet to be received
+	// We cannot simply delete them. First we have to check,
 	// whether another user already received and read the message.
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1143,7 +1143,7 @@ function phpbb_delete_user_pms($user_id)
 
 	if (!empty($undelivered_msg))
 	{
-		// A pm is delivered, if for any receipt the message was moved
+		// A pm is delivered, if for any recipient the message was moved
 		// from their NO_BOX to another folder. We do not delete such
 		// messages, but only delete them for users, who have not yet
 		// received them.
-- 
cgit v1.2.1


From 67665f59577092badf7eb0b5585e5ae39c52c8da Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Sat, 14 Jul 2012 18:12:57 -0500
Subject: [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

PHPBB3-10990
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8542e3ab0a..7a6ccf08da 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2045,7 +2045,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 			'SUBJECT'			=> $subject,
 			'SENT_DATE'			=> $user->format_date($row['message_time']),
 			'MESSAGE'			=> $message,
-			'FOLDER'			=> implode(', ', $row['folder']),
+			'FOLDER'			=> implode($user->lang['COMMA_SEPARATOR'], $row['folder']),
 			'DECODED_MESSAGE'	=> $decoded_message,
 
 			'S_CURRENT_MSG'		=> ($row['msg_id'] == $msg_id),
-- 
cgit v1.2.1