1 files changed, 117 insertions, 75 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index 49c68beef1..a516a8b194 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -210,82 +210,12 @@ class acp_prune
 
 		if ($prune)
 		{
+			$action = request_var('action', 'deactivate');
+
 			if (confirm_box(true))
 			{
-				$users = request_var('users', '', true);
-				$action = request_var('action', 'deactivate');
-				$deleteposts = request_var('deleteposts', 0);
-		
-				if ($users)
-				{
-					$users = explode("\n", $users);
-					$where_sql = ' AND ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', $users));
-				}
-				else
-				{
-					$username = request_var('username', '', true);
-					$email = request_var('email', '');
-
-					$joined_select = request_var('joined_select', 'lt');
-					$active_select = request_var('active_select', 'lt');
-					$count_select = request_var('count_select', 'eq');
-					$joined = request_var('joined', '');
-					$active = request_var('active', '');
-
-					$active = ($active) ? explode('-', $active) : array();
-					$joined = ($joined) ? explode('-', $joined) : array();
-
-					if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3))
-					{
-						trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$count = request_var('count', 0);
-
-					$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
-					$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
-
-					$where_sql = '';
-					$where_sql .= ($username) ? " AND username_clean LIKE '" . $db->sql_escape(str_replace('*', '%', utf8_clean_string($username))) . "'" : '';
-					$where_sql .= ($email) ? " AND user_email LIKE '" . $db->sql_escape(str_replace('*', '%', $email)) . "' " : '';
-					$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
-					$where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . " $count " : '';
-					$where_sql .= (sizeof($active)) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) : '';
-				}
-
-				// Get bot ids
-				$sql = 'SELECT user_id 
-					FROM ' . BOTS_TABLE;
-				$result = $db->sql_query($sql);
-
-				$bot_ids = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$bot_ids[] = $row['user_id'];
-				}
-				$db->sql_freeresult($result);
-
-				// Do not prune founder members
-				$sql = 'SELECT user_id, username
-					FROM ' . USERS_TABLE . '
-					WHERE user_id <> ' . ANONYMOUS . '
-						AND user_type <> ' . USER_FOUNDER . "
-					$where_sql";
-				$result = $db->sql_query($sql);
-
-				$where_sql = '';
 				$user_ids = $usernames = array();
-
-				while ($row = $db->sql_fetchrow($result))
-				{
-					// Do not prune bots and the user currently pruning.
-					if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
-					{
-						$user_ids[] = $row['user_id'];
-						$usernames[$row['user_id']] = $row['username'];
-					}
-				}
-				$db->sql_freeresult($result);
+				$this->get_prune_users($user_ids, $usernames);
 
 				if (sizeof($user_ids))
 				{
@@ -328,6 +258,30 @@ class acp_prune
 			}
 			else
 			{
+				// We list the users which will be pruned...
+				$user_ids = $usernames = array();
+				$this->get_prune_users($user_ids, $usernames);
+
+				if (!sizeof($user_ids))
+				{
+					trigger_error($user->lang['USER_PRUNE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				// Assign to template
+				foreach ($user_ids as $user_id)
+				{
+					$template->assign_block_vars('users', array(
+						'USERNAME'			=> $usernames[$user_id],
+						'U_PROFILE'			=> append_sid($phpbb_root_path . 'memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $user_id),
+						'U_USER_ADMIN'		=> ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview&amp;u=' . $user_id, true, $user->session_id) : '',
+					));
+				}
+
+				$template->assign_vars(array(
+					'S_DEACTIVATE'		=> ($action == 'deactivate') ? true : false,
+					'S_DELETE'			=> ($action == 'delete') ? true : false,
+				));
+
 				confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
 					'i'				=> $id,
 					'mode'			=> $mode,
@@ -341,11 +295,11 @@ class acp_prune
 					'active_select'	=> request_var('active_select', ''),
 					'active'		=> request_var('active', ''),
 					'count_select'	=> request_var('count_select', ''),
-					'count'			=> request_var('count', 0),
+					'count'			=> request_var('count', ''),
 					'deleteposts'	=> request_var('deleteposts', 0),
 
 					'action'		=> request_var('action', ''),
-				)));
+				)), 'confirm_body_prune.html');
 			}
 		}
 
@@ -379,6 +333,94 @@ class acp_prune
 			'U_FIND_USER'		=> append_sid($phpbb_root_path . "memberlist.$phpEx", 'mode=searchuser&amp;form=acp_prune&amp;field=users'))
 		);
 	}
+
+	/**
+	* Get user_ids/usernames from those being pruned
+	*/
+	function get_prune_users(&$user_ids, &$usernames)
+	{
+		global $user, $db;
+
+		$users = request_var('users', '', true);
+		$deleteposts = request_var('deleteposts', 0);
+		
+		if ($users)
+		{
+			$users = explode("\n", $users);
+			$where_sql = ' AND ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', $users));
+		}
+		else
+		{
+			$username = request_var('username', '', true);
+			$email = request_var('email', '');
+
+			$joined_select = request_var('joined_select', 'lt');
+			$active_select = request_var('active_select', 'lt');
+			$count_select = request_var('count_select', 'eq');
+			$joined = request_var('joined', '');
+			$active = request_var('active', '');
+
+			$active = ($active) ? explode('-', $active) : array();
+			$joined = ($joined) ? explode('-', $joined) : array();
+
+			if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3))
+			{
+				trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
+			$count = request_var('count', '');
+
+			$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
+			$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
+
+			$where_sql = '';
+			$where_sql .= ($username) ? " AND username_clean LIKE '" . $db->sql_escape(str_replace('*', '%', utf8_clean_string($username))) . "'" : '';
+			$where_sql .= ($email) ? " AND user_email LIKE '" . $db->sql_escape(str_replace('*', '%', $email)) . "' " : '';
+			$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
+			$where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
+			$where_sql .= (sizeof($active)) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) : '';
+		}
+
+		// Protect the admin, do not prune if no options are given...
+		if (!$where_sql)
+		{
+			return;
+		}
+
+		// Get bot ids
+		$sql = 'SELECT user_id 
+			FROM ' . BOTS_TABLE;
+		$result = $db->sql_query($sql);
+
+		$bot_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$bot_ids[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Do not prune founder members
+		$sql = 'SELECT user_id, username
+			FROM ' . USERS_TABLE . '
+			WHERE user_id <> ' . ANONYMOUS . '
+				AND user_type <> ' . USER_FOUNDER . "
+			$where_sql";
+		$result = $db->sql_query($sql);
+
+		$where_sql = '';
+		$user_ids = $usernames = array();
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Do not prune bots and the user currently pruning.
+			if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
+			{
+				$user_ids[] = $row['user_id'];
+				$usernames[$row['user_id']] = $row['username'];
+			}
+		}
+		$db->sql_freeresult($result);
+	}
 }
 
 ?>
 \ No newline at end of file