From e7e0ab9d0b33121e38a236879fcca417072140f6 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Mon, 17 May 2010 12:12:00 -0500
Subject: [feature/prune-users] Rework user_delete() functions_user.php

user_delete now uses fewer queries to delete a set of users of size > 1 by
accepting an array of users rather than a single user at a time.  This required
changing the third parameter, however the function retains its former behavior
with the old-style parameters.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 265 +++++++++++++++++++++-----------------
 1 file changed, 147 insertions(+), 118 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 317578cd54..0886e8aabf 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -330,20 +330,32 @@ function user_add($user_row, $cp_data = false)
 
 /**
 * Remove User
+* @param $mode Either 'retain' or 'remove'
 */
-function user_delete($mode, $user_id, $post_username = false)
+function user_delete($mode, $user_ids, $retain_username = true)
 {
 	global $cache, $config, $db, $user, $auth;
 	global $phpbb_root_path, $phpEx;
 
+	$db->sql_transaction('begin');
+
+	$user_rows = array();
+	if (!is_array($user_ids))
+	{
+		$user_ids = array($user_ids);
+	}
+
 	$sql = 'SELECT *
 		FROM ' . USERS_TABLE . '
-		WHERE user_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('user_id', $user_ids);
 	$result = $db->sql_query($sql);
-	$user_row = $db->sql_fetchrow($result);
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$user_rows[$row['user_id']] = $row;
+	}
 	$db->sql_freeresult($result);
 
-	if (!$user_row)
+	if (!$user_rows)
 	{
 		return false;
 	}
@@ -351,7 +363,8 @@ function user_delete($mode, $user_id, $post_username = false)
 	// Before we begin, we will remove the reports the user issued.
 	$sql = 'SELECT r.post_id, p.topic_id
 		FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
-		WHERE r.user_id = ' . $user_id . '
+		WHERE ' . $db->sql_in_set('r.user_id', $user_ids) . //r.user_id = ' . $user_id . '
+			'
 			AND p.post_id = r.post_id';
 	$result = $db->sql_query($sql);
 
@@ -405,135 +418,157 @@ function user_delete($mode, $user_id, $post_username = false)
 	}
 
 	// Remove reports
-	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id);
-
-	if ($user_row['user_avatar'] && $user_row['user_avatar_type'] == AVATAR_UPLOAD)
-	{
-		avatar_delete('user', $user_row);
-	}
+	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $user_ids));
 
-	switch ($mode)
+	// Some things need to be done in the loop (if the query changes based
+	// on which user is currently being deleted)
+	$added_guest_posts = 0;
+	foreach ($user_rows as $user_id => $user_row)
 	{
-		case 'retain':
+		if ($user_row['user_avatar'] && $user_row['user_avatar_type'] == AVATAR_UPLOAD)
+		{
+			avatar_delete('user', $user_row);
+		}
 
-			$db->sql_transaction('begin');
+		// Decrement number of users if this user is active
+		if ($user_row['user_type'] != USER_INACTIVE && $user_row['user_type'] != USER_IGNORE)
+		{
+			set_config_count('num_users', -1, true);
+		}
 
-			if ($post_username === false)
-			{
-				$post_username = $user->lang['GUEST'];
-			}
+		switch ($mode)
+		{
+			case 'retain':
+				if ($retain_username === false)
+				{
+					$post_username = $user->lang['GUEST'];
+				}
+				else
+				{
+					$post_username = $user_row['username'];
+				}
 
-			// If the user is inactive and newly registered we assume no posts from this user being there...
-			if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts'])
-			{
-			}
-			else
-			{
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET forum_last_poster_id = ' . ANONYMOUS . ", forum_last_poster_name = '" . $db->sql_escape($post_username) . "', forum_last_poster_colour = ''
-					WHERE forum_last_poster_id = $user_id";
-				$db->sql_query($sql);
+				// If the user is inactive and newly registered we assume no posts from the user, and save the queries
+				if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts'])
+				{
+				}
+				else
+				{
+					// When we delete these users and retain the posts, we must assign all the data to the guest user
+					$sql = 'UPDATE ' . FORUMS_TABLE . '
+						SET forum_last_poster_id = ' . ANONYMOUS . ", forum_last_poster_name = '" . $db->sql_escape($post_username) . "', forum_last_poster_colour = ''
+						WHERE forum_last_poster_id = $user_id";
+					$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET poster_id = ' . ANONYMOUS . ", post_username = '" . $db->sql_escape($post_username) . "'
-					WHERE poster_id = $user_id";
-				$db->sql_query($sql);
+					$sql = 'UPDATE ' . POSTS_TABLE . '
+						SET poster_id = ' . ANONYMOUS . ", post_username = '" . $db->sql_escape($post_username) . "'
+						WHERE poster_id = $user_id";
+					$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET post_edit_user = ' . ANONYMOUS . "
-					WHERE post_edit_user = $user_id";
-				$db->sql_query($sql);
+					$sql = 'UPDATE ' . TOPICS_TABLE . '
+						SET topic_poster = ' . ANONYMOUS . ", topic_first_poster_name = '" . $db->sql_escape($post_username) . "', topic_first_poster_colour = ''
+						WHERE topic_poster = $user_id";
+					$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_poster = ' . ANONYMOUS . ", topic_first_poster_name = '" . $db->sql_escape($post_username) . "', topic_first_poster_colour = ''
-					WHERE topic_poster = $user_id";
-				$db->sql_query($sql);
+					$sql = 'UPDATE ' . TOPICS_TABLE . '
+						SET topic_last_poster_id = ' . ANONYMOUS . ", topic_last_poster_name = '" . $db->sql_escape($post_username) . "', topic_last_poster_colour = ''
+						WHERE topic_last_poster_id = $user_id";
+					$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_last_poster_id = ' . ANONYMOUS . ", topic_last_poster_name = '" . $db->sql_escape($post_username) . "', topic_last_poster_colour = ''
-					WHERE topic_last_poster_id = $user_id";
-				$db->sql_query($sql);
+					// Since we change every post by this author, we need to count this amount towards the anonymous user
 
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-					SET poster_id = ' . ANONYMOUS . "
-					WHERE poster_id = $user_id";
-				$db->sql_query($sql);
+					if ($user_row['user_posts'])
+					{
+						$added_guest_posts += $user_row['user_posts'];
+					}
+				}
+			break;
 
-				// Since we change every post by this author, we need to count this amount towards the anonymous user
+			case 'remove':
+				// there is nothing variant specific to deleting posts
+			break;
+		}
+	}
 
-				// Update the post count for the anonymous user
-				if ($user_row['user_posts'])
-				{
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_posts = user_posts + ' . $user_row['user_posts'] . '
-						WHERE user_id = ' . ANONYMOUS;
-					$db->sql_query($sql);
-				}
-			}
+	// Now do the invariant tasks
+	// all queries performed in one call of this function are in a single transaction
+	// so this is kosher
+	if ($mode == 'retain')
+	{
+		// Assign more data to the Anonymous user
+		$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
+			SET poster_id = ' . ANONYMOUS . '
+			WHERE ' . $db->sql_in_set('poster_id', $user_ids);
+		$db->sql_query($sql);
 
-			$db->sql_transaction('commit');
+		$sql = 'UPDATE ' . POSTS_TABLE . '
+			SET post_edit_user = ' . ANONYMOUS . '
+			WHERE ' . $db->sql_in_set('post_edit_user', $user_ids);
+		$db->sql_query($sql);
 
-		break;
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_posts = user_posts + ' . $added_guest_posts . '
+			WHERE user_id = ' . ANONYMOUS;
+		$db->sql_query($sql);
+	}
+	else if ($mode == 'remove')
+	{
+		if (!function_exists('delete_posts'))
+		{
+			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+		}
 
-		case 'remove':
+		// Find any topics whose only posts are being deleted, and remove them from the topics table
+		$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
+			FROM ' . POSTS_TABLE . '
+			WHERE ' . $db->sql_in_set('poster_id', $user_ids) . '
+			GROUP BY topic_id';
+		$result = $db->sql_query($sql);
 
-			if (!function_exists('delete_posts'))
-			{
-				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-			}
+		$topic_id_ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$topic_id_ary[$row['topic_id']] = $row['total_posts'];
+		}
+		$db->sql_freeresult($result);
 
-			$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
-				FROM ' . POSTS_TABLE . "
-				WHERE poster_id = $user_id
-				GROUP BY topic_id";
+		if (sizeof($topic_id_ary))
+		{
+			$sql = 'SELECT topic_id, topic_replies, topic_replies_real
+				FROM ' . TOPICS_TABLE . '
+				WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
 			$result = $db->sql_query($sql);
 
-			$topic_id_ary = array();
+			$del_topic_ary = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$topic_id_ary[$row['topic_id']] = $row['total_posts'];
+				if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
+				{
+					$del_topic_ary[] = $row['topic_id'];
+				}
 			}
 			$db->sql_freeresult($result);
 
-			if (sizeof($topic_id_ary))
+			if (sizeof($del_topic_ary))
 			{
-				$sql = 'SELECT topic_id, topic_replies, topic_replies_real
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
-				$result = $db->sql_query($sql);
-
-				$del_topic_ary = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
-					{
-						$del_topic_ary[] = $row['topic_id'];
-					}
-				}
-				$db->sql_freeresult($result);
-
-				if (sizeof($del_topic_ary))
-				{
-					$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-						WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary);
-					$db->sql_query($sql);
-				}
+				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+					WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary);
+				$db->sql_query($sql);
 			}
+		}
 
-			// Delete posts, attachments, etc.
-			delete_posts('poster_id', $user_id);
-
-		break;
+		// actually do the meat of the work if we are deleting all the users' posts
+		// delete_posts can handle any number of IDs in its second argument
+		delete_posts('poster_id', $user_ids);
 	}
 
-	$db->sql_transaction('begin');
-
 	$table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE, DRAFTS_TABLE, BOOKMARKS_TABLE, SESSIONS_KEYS_TABLE, PRIVMSGS_FOLDER_TABLE, PRIVMSGS_RULES_TABLE);
 
+	// Delete the miscellaneous (non-post) data for the user
 	foreach ($table_ary as $table)
 	{
 		$sql = "DELETE FROM $table
-			WHERE user_id = $user_id";
+			WHERE " . $db->sql_in_set('user_id', $user_ids);
 		$db->sql_query($sql);
 	}
 
@@ -541,35 +576,35 @@ function user_delete($mode, $user_id, $post_username = false)
 
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
-		WHERE reportee_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('user_id', $user_ids); //reportee_id = ' . $user_id;
 	$db->sql_query($sql);
 
 	// Change user_id to anonymous for this users triggered events
 	$sql = 'UPDATE ' . LOG_TABLE . '
 		SET user_id = ' . ANONYMOUS . '
-		WHERE user_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('user_id', $user_ids); //user_id = ' . $user_id;
 	$db->sql_query($sql);
 
 	// Delete the user_id from the zebra table
 	$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-		WHERE user_id = ' . $user_id . '
-			OR zebra_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('user_id', $user_ids) . //user_id = ' . $user_id . '
+			' OR ' . $db->sql_in_set('zebra_id', $user_ids);
 	$db->sql_query($sql);
 
 	// Delete the user_id from the banlist
 	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
-		WHERE ban_userid = ' . $user_id;
+		WHERE ' . $db->sql_in_set('ban_userid', $user_ids);
 	$db->sql_query($sql);
 
 	// Delete the user_id from the session table
 	$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-		WHERE session_user_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('session_user_id', $user_ids);
 	$db->sql_query($sql);
 
 	// Remove any undelivered mails...
 	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
+		WHERE ' . $db->sql_in_set('author_id', $user_ids) . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$result = $db->sql_query($sql);
 
@@ -589,24 +624,24 @@ function user_delete($mode, $user_id, $post_username = false)
 	}
 
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
+		WHERE ' . $db->sql_in_set('author_id', $user_id) . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$db->sql_query($sql);
 
 	// Delete all to-information
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('user_id', $user_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;
+		WHERE ' . $db->sql_in_set('author_id', $user_ids);
 	$db->sql_query($sql);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
 		SET author_id = ' . ANONYMOUS . '
-		WHERE author_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('author_id', $user_id);
 	$db->sql_query($sql);
 
 	foreach ($undelivered_user as $_user_id => $ary)
@@ -626,17 +661,11 @@ function user_delete($mode, $user_id, $post_username = false)
 	$db->sql_transaction('commit');
 
 	// Reset newest user info if appropriate
-	if ($config['newest_user_id'] == $user_id)
+	if (in_array($config['newest_user_id'], $user_ids))
 	{
 		update_last_username();
 	}
 
-	// Decrement number of users if this user is active
-	if ($user_row['user_type'] != USER_INACTIVE && $user_row['user_type'] != USER_IGNORE)
-	{
-		set_config_count('num_users', -1, true);
-	}
-
 	return false;
 }
 
-- 
cgit v1.2.1


From 04a6303527d9bf29114b51001d06af5235ea0847 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 03:01:38 -0400
Subject: [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.

This was done in PHPBB3-9872.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 41 +--------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 0886e8aabf..9b16a56b1c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -518,46 +518,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
 
-		// Find any topics whose only posts are being deleted, and remove them from the topics table
-		$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . $db->sql_in_set('poster_id', $user_ids) . '
-			GROUP BY topic_id';
-		$result = $db->sql_query($sql);
-
-		$topic_id_ary = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$topic_id_ary[$row['topic_id']] = $row['total_posts'];
-		}
-		$db->sql_freeresult($result);
-
-		if (sizeof($topic_id_ary))
-		{
-			$sql = 'SELECT topic_id, topic_replies, topic_replies_real
-				FROM ' . TOPICS_TABLE . '
-				WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
-			$result = $db->sql_query($sql);
-
-			$del_topic_ary = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
-				{
-					$del_topic_ary[] = $row['topic_id'];
-				}
-			}
-			$db->sql_freeresult($result);
-
-			if (sizeof($del_topic_ary))
-			{
-				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-					WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary);
-				$db->sql_query($sql);
-			}
-		}
-
-		// actually do the meat of the work if we are deleting all the users' posts
+		// Delete posts, attachments, etc.
 		// delete_posts can handle any number of IDs in its second argument
 		delete_posts('poster_id', $user_ids);
 	}
-- 
cgit v1.2.1


From 44f524aa5049459c0b272ed98daaf84444030010 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 12:56:42 -0400
Subject: [feature/prune-users] Call sql_is_set for user ids once in
 user_delete.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index de01c3e5cb..d67ada026a 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -345,9 +345,11 @@ function user_delete($mode, $user_ids, $retain_username = true)
 		$user_ids = array($user_ids);
 	}
 
+	$user_id_sql = $db->sql_in_set('user_id', $user_ids);
+
 	$sql = 'SELECT *
 		FROM ' . USERS_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $user_ids);
+		WHERE ' . $user_id_sql;
 	$result = $db->sql_query($sql);
 	while ($row = $db->sql_fetchrow($result))
 	{
@@ -418,7 +420,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	}
 
 	// Remove reports
-	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $user_ids));
+	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE ' . $user_id_sql);
 
 	// Some things need to be done in the loop (if the query changes based
 	// on which user is currently being deleted)
@@ -529,7 +531,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	foreach ($table_ary as $table)
 	{
 		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set('user_id', $user_ids);
+			WHERE " . $user_id_sql;
 		$db->sql_query($sql);
 	}
 
@@ -537,18 +539,18 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $user_ids); //reportee_id = ' . $user_id;
+		WHERE ' . $user_id_sql; //reportee_id = ' . $user_id;
 	$db->sql_query($sql);
 
 	// Change user_id to anonymous for this users triggered events
 	$sql = 'UPDATE ' . LOG_TABLE . '
 		SET user_id = ' . ANONYMOUS . '
-		WHERE ' . $db->sql_in_set('user_id', $user_ids); //user_id = ' . $user_id;
+		WHERE ' . $user_id_sql; //user_id = ' . $user_id;
 	$db->sql_query($sql);
 
 	// Delete the user_id from the zebra table
 	$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $user_ids) . //user_id = ' . $user_id . '
+		WHERE ' . $user_id_sql . //user_id = ' . $user_id . '
 			' OR ' . $db->sql_in_set('zebra_id', $user_ids);
 	$db->sql_query($sql);
 
@@ -591,7 +593,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	// Delete all to-information
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $user_ids);
+		WHERE ' . $user_id_sql;
 	$db->sql_query($sql);
 
 	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
-- 
cgit v1.2.1


From 0f17d5d493738b832f4d9d010e94d4d7fa113c89 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 13:13:59 -0400
Subject: [feature/prune-users] Replaced missed occurrences of $user_id with
 $user_ids.

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

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index d67ada026a..b21be08307 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -587,7 +587,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	}
 
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('author_id', $user_id) . '
+		WHERE ' . $db->sql_in_set('author_id', $user_ids) . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$db->sql_query($sql);
 
@@ -604,7 +604,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
 		SET author_id = ' . ANONYMOUS . '
-		WHERE ' . $db->sql_in_set('author_id', $user_id);
+		WHERE ' . $db->sql_in_set('author_id', $user_ids);
 	$db->sql_query($sql);
 
 	foreach ($undelivered_user as $_user_id => $ary)
-- 
cgit v1.2.1


From f65556e6defb2750fcf680bd29e56f2416176fe1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 13:16:15 -0400
Subject: [feature/prune-users] Call sql_is_set once for author ids in
 user_delete.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b21be08307..3926de2b12 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -537,6 +537,8 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
 
+	$author_id_sql = $db->sql_in_set('author_id', $user_ids);
+
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
 		WHERE ' . $user_id_sql; //reportee_id = ' . $user_id;
@@ -567,7 +569,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	// Remove any undelivered mails...
 	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('author_id', $user_ids) . '
+		WHERE ' . $author_id_sql . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$result = $db->sql_query($sql);
 
@@ -587,7 +589,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	}
 
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('author_id', $user_ids) . '
+		WHERE ' . $author_id_sql . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$db->sql_query($sql);
 
@@ -599,12 +601,12 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	// 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 ' . $db->sql_in_set('author_id', $user_ids);
+		WHERE ' . $author_id_sql;
 	$db->sql_query($sql);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
 		SET author_id = ' . ANONYMOUS . '
-		WHERE ' . $db->sql_in_set('author_id', $user_ids);
+		WHERE ' . $author_id_sql;
 	$db->sql_query($sql);
 
 	foreach ($undelivered_user as $_user_id => $ary)
-- 
cgit v1.2.1


From e23868f3e2e95ea5b6bc5d4a14fc48f8bce99615 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 13:17:45 -0400
Subject: [feature/prune-users] Fixed user id check in undelivered users loop.

There is now $user_ids instead of one $user_id.

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

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3926de2b12..2ac8ff0eec 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -611,7 +611,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	foreach ($undelivered_user as $_user_id => $ary)
 	{
-		if ($_user_id == $user_id)
+		if (in_array($_user_id, $user_ids))
 		{
 			continue;
 		}
-- 
cgit v1.2.1


From 9f32cae5f9b4e3524dd82be266ed638152920ebb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 13:28:09 -0400
Subject: [feature/prune_users] Moved set_config_count out of user loop.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2ac8ff0eec..e9655ba736 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -422,6 +422,8 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	// Remove reports
 	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE ' . $user_id_sql);
 
+	$num_users_delta = 0;
+
 	// Some things need to be done in the loop (if the query changes based
 	// on which user is currently being deleted)
 	$added_guest_posts = 0;
@@ -435,7 +437,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 		// Decrement number of users if this user is active
 		if ($user_row['user_type'] != USER_INACTIVE && $user_row['user_type'] != USER_IGNORE)
 		{
-			set_config_count('num_users', -1, true);
+			--$num_users_delta;
 		}
 
 		switch ($mode)
@@ -492,6 +494,11 @@ function user_delete($mode, $user_ids, $retain_username = true)
 		}
 	}
 
+	if ($num_users_delta != 0)
+	{
+		set_config_count('num_users', $num_users_delta, true);
+	}
+
 	// Now do the invariant tasks
 	// all queries performed in one call of this function are in a single transaction
 	// so this is kosher
-- 
cgit v1.2.1


From 15d2f294c664e11fb1f2bc84238067cf71a544e6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 25 Mar 2012 20:56:00 -0400
Subject: [feature/prune-users] Cosmetic changes per bantu's review.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index e9655ba736..c78949342b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -365,8 +365,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	// Before we begin, we will remove the reports the user issued.
 	$sql = 'SELECT r.post_id, p.topic_id
 		FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
-		WHERE ' . $db->sql_in_set('r.user_id', $user_ids) . //r.user_id = ' . $user_id . '
-			'
+		WHERE ' . $db->sql_in_set('r.user_id', $user_ids) . '
 			AND p.post_id = r.post_id';
 	$result = $db->sql_query($sql);
 
@@ -554,13 +553,13 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	// Change user_id to anonymous for this users triggered events
 	$sql = 'UPDATE ' . LOG_TABLE . '
 		SET user_id = ' . ANONYMOUS . '
-		WHERE ' . $user_id_sql; //user_id = ' . $user_id;
+		WHERE ' . $user_id_sql;
 	$db->sql_query($sql);
 
 	// Delete the user_id from the zebra table
 	$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-		WHERE ' . $user_id_sql . //user_id = ' . $user_id . '
-			' OR ' . $db->sql_in_set('zebra_id', $user_ids);
+		WHERE ' . $user_id_sql . '
+			OR ' . $db->sql_in_set('zebra_id', $user_ids);
 	$db->sql_query($sql);
 
 	// Delete the user_id from the banlist
-- 
cgit v1.2.1


From 953e829b527acd6de80fee93bb1bfd08c6010c51 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 25 Mar 2012 20:57:35 -0400
Subject: [feature/prune-users] Non-cosmetic changes per bantu's review.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index c78949342b..09a6394323 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -353,7 +353,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	$result = $db->sql_query($sql);
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$user_rows[$row['user_id']] = $row;
+		$user_rows[(int) $row['user_id']] = $row;
 	}
 	$db->sql_freeresult($result);
 
@@ -451,11 +451,10 @@ function user_delete($mode, $user_ids, $retain_username = true)
 					$post_username = $user_row['username'];
 				}
 
-				// If the user is inactive and newly registered we assume no posts from the user, and save the queries
-				if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts'])
-				{
-				}
-				else
+				// If the user is inactive and newly registered
+				// we assume no posts from the user, and save
+				// the queries
+				if ($user_row['user_type'] != USER_INACTIVE || $user_row['user_inactive_reason'] != INACTIVE_REGISTER || $user_row['user_posts'])
 				{
 					// When we delete these users and retain the posts, we must assign all the data to the guest user
 					$sql = 'UPDATE ' . FORUMS_TABLE . '
-- 
cgit v1.2.1


From 138d2e2a4cbfbac0b6bc04d81b618fac62a69fb9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 25 Mar 2012 20:59:37 -0400
Subject: [feature/prune-users] Fix incorrect condition when deleting log
 entries.

The original commit incorrectly replaced reportee_id with user_id.

Change it back to reportee_id. The comment was correct.

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

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 09a6394323..ff6b60633a 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -546,7 +546,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
-		WHERE ' . $user_id_sql; //reportee_id = ' . $user_id;
+		WHERE ' . $db->sql_in_set('reportee_id', $user_ids);
 	$db->sql_query($sql);
 
 	// Change user_id to anonymous for this users triggered events
-- 
cgit v1.2.1


From 7c752aa3defa92128bb1e38ff3305a978d37e4d3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 25 Mar 2012 21:08:06 -0400
Subject: [feature/prune-users] Use a map instead of performing array scans.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index ff6b60633a..940018ebad 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -614,9 +614,11 @@ function user_delete($mode, $user_ids, $retain_username = true)
 		WHERE ' . $author_id_sql;
 	$db->sql_query($sql);
 
+	$user_ids_map = array_flip($user_ids);
+
 	foreach ($undelivered_user as $_user_id => $ary)
 	{
-		if (in_array($_user_id, $user_ids))
+		if (isset($user_ids_map[$_user_id]))
 		{
 			continue;
 		}
@@ -631,7 +633,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	$db->sql_transaction('commit');
 
 	// Reset newest user info if appropriate
-	if (in_array($config['newest_user_id'], $user_ids))
+	if (isset($user_ids_map[$config['newest_user_id']]))
 	{
 		update_last_username();
 	}
-- 
cgit v1.2.1


From b76454dd835d24e14ebd2cfeba1508f9cf1fc12e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 19 Apr 2012 20:27:21 -0400
Subject: [feature/prune-users] Use empty for checking array size.

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

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 940018ebad..3db0d9ba96 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -357,7 +357,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
 	}
 	$db->sql_freeresult($result);
 
-	if (!$user_rows)
+	if (empty($user_rows))
 	{
 		return false;
 	}
-- 
cgit v1.2.1


From a3b87f1e953e4f79478d8e7eb65ca9855140243a Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Wed, 15 Aug 2012 15:07:42 +0100
Subject: [ticket/10939] Modified functions_user.php to not use $_FILES

PHPBB3-10939
---
 phpBB/includes/functions_user.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6e658b4ef4..405c5ef5d1 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2059,13 +2059,14 @@ function avatar_remote($data, &$error)
 */
 function avatar_upload($data, &$error)
 {
-	global $phpbb_root_path, $config, $db, $user, $phpEx;
+	global $phpbb_root_path, $config, $db, $user, $phpEx, $request;
 
 	// Init upload class
 	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
 	$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false));
 
-	if (!empty($_FILES['uploadfile']['name']))
+	$uploadfile = $request->file('uploadfile');
+	if (!empty($uploadfile['name']))
 	{
 		$file = $upload->form_upload('uploadfile');
 	}
@@ -2288,7 +2289,7 @@ function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $
 */
 function avatar_process_user(&$error, $custom_userdata = false, $can_upload = null)
 {
-	global $config, $phpbb_root_path, $auth, $user, $db;
+	global $config, $phpbb_root_path, $auth, $user, $db, $request;
 
 	$data = array(
 		'uploadurl'		=> request_var('uploadurl', ''),
@@ -2330,7 +2331,8 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu
 		$can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 	}
 
-	if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload)
+	$uploadfile = $request->file('uploadfile');
+	if ((!empty($uploadfile['name']) || $data['uploadurl']) && $can_upload)
 	{
 		list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error);
 	}
-- 
cgit v1.2.1


From 4f6f0c08979d420a47f5cc4bcab2709d27853222 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 21 Aug 2012 17:04:16 -0400
Subject: [feature/add_events] Event to modify the data array for when a user
 is added

PHPBB3-9550
---
 phpBB/includes/functions_user.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 9e33a5122e..f4ecb7cdc3 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -255,6 +255,16 @@ function user_add($user_row, $cp_data = false)
 		}
 	}
 
+	/**
+	* Use this event to modify the values to be inserted when a user is added
+	*
+	* @event core.user_add_modify_data
+	* @var array	sql_ary		Array of data to be inserted when a user is added
+	* @since 3.1-A1
+	*/
+	$vars = array('sql_ary');
+	extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars)));
+
 	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
 	$db->sql_query($sql);
 
-- 
cgit v1.2.1


From 46597be1a372f1215ffc18cfd645c1e977b44d84 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 22 Aug 2012 08:37:33 -0400
Subject: [feature/add_events] Globalize event dispatcher object in some
 functions

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

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index f4ecb7cdc3..f843902dd5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -162,6 +162,7 @@ function user_update_name($old_name, $new_name)
 function user_add($user_row, $cp_data = false)
 {
 	global $db, $user, $auth, $config, $phpbb_root_path, $phpEx;
+	global $phpbb_dispatcher;
 
 	if (empty($user_row['username']) || !isset($user_row['group_id']) || !isset($user_row['user_email']) || !isset($user_row['user_type']))
 	{
-- 
cgit v1.2.1


From 443af0ad5679c054502a0b5a8ec778c1bbd9e9d0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 6 Nov 2012 11:15:41 -0500
Subject: [feature/prune-users] $author_id_sql is no longer needed here.

PHPBB3-9622
---
 phpBB/includes/functions_user.php | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 42b613c4f0..0e347fe477 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -574,8 +574,6 @@ function user_delete($mode, $user_ids, $retain_username = true)
 
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
 
-	$author_id_sql = $db->sql_in_set('author_id', $user_ids);
-
 	// Delete user log entries about this user
 	$sql = 'DELETE FROM ' . LOG_TABLE . '
 		WHERE ' . $db->sql_in_set('reportee_id', $user_ids);
-- 
cgit v1.2.1