[feature/prune-users] Adjust some language strings for new features

Adjust two language strings for ACP prune feature to include descriptions for
new features.

PHPBB3-9622

phpBB/adm/style/acp_prune_users.html

@@ -9,7 +9,7 @@
 <form id="acp_prune" method="post" action="{U_ACTION}">
 	
 <fieldset>
-	<legend>{L_ACP_PRUNE_USERS}</legend>
+	<legend>{L_CRITERIA}</legend>
 <dl>
 	<dt><label for="username">{L_USERNAME}:</label></dt>
 	<dd><input type="text" id="username" name="username" /></dd>
@@ -18,9 +18,16 @@
 	<dt><label for="email">{L_EMAIL}:</label></dt>
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
+<dl>
+	<dt><label for="email">{L_WEBSITE}:</label></dt>
+	<dd><input type="text" id="website" name="website" /></dd>
+</dl>
 <dl>
 	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
-	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
+	<dd>
+		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
+		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
+	</dd>
 </dl>
 <dl>
 	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
@@ -30,11 +37,27 @@
 	<dt><label for="count">{L_POSTS}:</label></dt>
 	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
 </dl>
+<dl>
+	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt>
+	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
+</dl>
+<dl>
+	<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
+	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
+</dl>
+</fieldset>
+
+<fieldset>
+	<legend>{L_USERNAMES}</legend>
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
+</fieldset>
+
+<fieldset>
+	<legend>{L_OPTIONS}</legend>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>

phpBB/adm/style/confirm_body_prune.html

@@ -2,6 +2,23 @@
 
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
 
+<fieldset id="userlist">
+	<h2>{L_PRUNE_USERS_LIST}</h2>
+	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
+
+	<br />
+	<!-- BEGIN users -->
+	&raquo; <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" />
+	<a href="{users.U_PROFILE}">{users.USERNAME}</a>
+	<!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
+	<!-- END users -->
+	<br />
+	<span class="small">
+	<a href="#" onclick="marklist('userlist', 'user_ids', true)">{L_MARK_ALL}</a> &bull;
+	<a href="#" onclick="marklist('userlist', 'user_ids', false)">{L_UNMARK_ALL}</a>
+	</span>
+</fieldset>
+
 <fieldset>
 	<h1>{MESSAGE_TITLE}</h1>
 	<p>{MESSAGE_TEXT}</p>
@@ -12,17 +29,6 @@
 		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
 		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
 	</div>
-
-	<h2>{L_PRUNE_USERS_LIST}</h2>
-	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
-
-	<br />
-	<!-- BEGIN users -->
-	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
-	<!-- END users -->
-
-	<br /><br />
-
 </fieldset>
 
 </form>

phpBB/includes/acp/acp_prune.php

@@ -243,6 +243,7 @@ class acp_prune
 			if (confirm_box(true))
 			{
 				$user_ids = $usernames = array();
+
 				$this->get_prune_users($user_ids, $usernames);
 
 				if (sizeof($user_ids))
@@ -256,10 +257,7 @@ class acp_prune
 					{
 						if ($deleteposts)
 						{
-							foreach ($user_ids as $user_id)
+							user_delete('remove', $user_ids);
-							{
-								user_delete('remove', $user_id);
-							}
 							
 							$l_log = 'LOG_PRUNE_USER_DEL_DEL';
 						}
@@ -297,6 +295,7 @@ class acp_prune
 				{
 					$template->assign_block_vars('users', array(
 						'USERNAME'			=> $usernames[$user_id],
+						'USER_ID'           => $user_id,
 						'U_PROFILE'			=> append_sid($phpbb_root_path . 'memberlist.' . $phpEx, 'mode=viewprofile&u=' . $user_id),
 						'U_USER_ADMIN'		=> ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview&u=' . $user_id, true, $user->session_id) : '',
 					));
@@ -312,8 +311,8 @@ class acp_prune
 					'mode'			=> $mode,
 					'prune'			=> 1,
 
-					'users'			=> utf8_normalize_nfc(request_var('users', '', true)),
+					'users'			=> request_var('users', '', true),
-					'username'		=> utf8_normalize_nfc(request_var('username', '', true)),
+					'username'		=> request_var('username', '', true),
 					'email'			=> request_var('email', ''),
 					'joined_select'	=> request_var('joined_select', ''),
 					'joined'		=> request_var('joined', ''),
@@ -338,22 +337,27 @@ class acp_prune
 		}
 
 		$find_time = array('lt' => $user->lang['BEFORE'], 'gt' => $user->lang['AFTER']);
-		$s_find_join_time = '';
-		foreach ($find_time as $key => $value)
-		{
-			$s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>';
-		}
-		
 		$s_find_active_time = '';
 		foreach ($find_time as $key => $value)
 		{
 			$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
 		}
 
+		$s_group_list = '<option value="0" selected="selected">' . $user->lang['SELECT_OPTION'] . '</option>';
+		$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . '
+			WHERE group_type <> ' . GROUP_SPECIAL . '
+			ORDER BY group_name ASC';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>';
+		}
+
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'S_JOINED_OPTIONS'	=> $s_find_join_time,
 			'S_ACTIVE_OPTIONS'	=> $s_find_active_time,
+			'S_GROUP_LIST'      => $s_group_list,
 			'S_COUNT_OPTIONS'	=> $s_find_count,
 			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=acp_prune&amp;field=users'),
 		));
@@ -366,42 +370,78 @@ class acp_prune
 	{
 		global $user, $db;
 
-		$users = utf8_normalize_nfc(request_var('users', '', true));
+		$users_by_name = request_var('users', '', true);
-		
+		$users_by_id = request_var('user_ids', array(0));
-		if ($users)
+
+		if ($users_by_name)
 		{
-			$users = explode("\n", $users);
+			$users = explode("\n", $users_by_name);
 			$where_sql = ' AND ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', $users));
 		}
+		else if (!empty($users_by_id))
+		{
+			$user_ids = $users_by_id;
+			user_get_id_name($user_ids, $usernames);
+
+			$where_sql = ' AND ' . $db->sql_in_set('user_id', $user_ids);
+		}
 		else
 		{
-			$username = utf8_normalize_nfc(request_var('username', '', true));
+			$username = request_var('username', '', true);
 			$email = request_var('email', '');
+			$website = request_var('website', '');
 
-			$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', '');
+			$queue_select = request_var('queue_select', 'gt');
+			$joined_before = request_var('joined_before', '');
+			$joined_after = request_var('joined_after', '');
 			$active = request_var('active', '');
 
-			$active = ($active) ? explode('-', $active) : array();
+			$count = request_var('count', 0);
-			$joined = ($joined) ? explode('-', $joined) : array();
+			$posts_on_queue = request_var('posts_on_queue', 0);
 
-			if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3))
+			$active = ($active) ? explode('-', $active) : array();
+			$joined_before = ($joined_before) ? explode('-', $joined_before) : array();
+			$joined_after = ($joined_after) ? explode('-', $joined_after) : array();
+
+			// calculate the conditions required by the join time criteria
+			$joined_sql = '';
+			if (!empty($joined_before) && !empty($joined_after))
+			{
+				// if the two entered dates are equal, we need to adjust
+				// so that our time range is a full day instead of 1 second
+				if ($joined_after == $joined_before)
+				{
+					$joined_after[2] += 1; //$joined_after[2]++;
+				}
+
+				$joined_sql = ' AND user_regdate BETWEEN ' . gmmktime(0, 0, 0, (int) $joined_after[1], (int) $joined_after[2], (int) $joined_after[0]) . ' AND ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[0]);
+			}
+			else if (empty($joined_before) && !empty($joined_after))
+			{
+				$joined_sql = ' AND user_regdate > ' . gmmktime(0, 0, 0, (int) $joined_after[1], (int) $joined_after[2], (int) $joined_after[0]);
+			}
+			else if (empty($joined_after) && !empty($joined_before))
+			{
+				$joined_sql = ' AND user_regdate < ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[3]);
+			}
+			// implicit else when both arrays are empty do nothing
+
+			if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined_before) && sizeof($joined_before) != 3) || (sizeof($joined_after) && sizeof($joined_after) != 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 ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : '';
 			$where_sql .= ($email) ? ' AND user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $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 .= ($website) ? ' AND user_website ' . $db->sql_like_expression(str_replace('*', $db->any_char, $website)) . ' ' : '';
-			$where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
+			$where_sql .= $joined_sql;
+			$where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
 			// First handle pruning of users who never logged in, last active date is 0000-00-00
 			if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
@@ -444,7 +484,6 @@ class acp_prune
 			$where_sql";
 		$result = $db->sql_query($sql);
 
-		$where_sql = '';
 		$user_ids = $usernames = array();
 
 		while ($row = $db->sql_fetchrow($result))
@@ -457,5 +496,49 @@ class acp_prune
 			}
 		}
 		$db->sql_freeresult($result);
+
+		if ($group_id)
+		{
+			$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . '
+				WHERE group_id = ' . (int) $group_id . '
+					AND user_pending = 0
+					AND ' . $db->sql_in_set('user_id', $user_ids, false, true);
+			$result = $db->sql_query($sql);
+
+			// we're performing an intersection operation, so all the relevant users
+			// come from this most recent query (which was limited to the results of the
+			// previous query)
+			$user_ids = $usernames = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$user_ids[] = $row['poster_id'];
+			}
+
+			// only get usernames if they are needed (not part of some later query)
+			if (!$posts_on_queue)
+			{
+				// this is an additional query aginst the users table
+				user_get_id_name($user_ids, $usernames);
+			}
+		}
+
+		if ($posts_on_queue)
+		{
+			$sql = 'SELECT poster_id, COUNT(post_id) AS queue_posts FROM ' . POSTS_TABLE . '
+				WHERE ' . $db->sql_in_set('poster_id', $user_ids, false, true) .
+				' GROUP BY poster_id
+				HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue;
+			$result = $db->sql_query($result);
+
+			// same intersection logic as the above group ID portion
+			$user_ids = $usernames = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$user_ids[] = $row['poster_id'];
+			}
+
+			// do an additional query to get the correct set of usernames
+			user_get_id_name($user_ids, $usernames);
+		}
 	}
 }

phpBB/language/en/acp/prune.php

@@ -37,7 +37,9 @@ if (empty($lang) || !is_array($lang))
 
 // User pruning
 $lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields.  Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+
+	'CRITERIA'      => 'Criteria',
 
 	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
 	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
@@ -45,15 +47,17 @@ $lang = array_merge($lang, array(
 	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
 	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
 
-	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.  You may use both fields to specify an interval, or leave one blank for an open date range.',
 
 	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
 
+	'POSTS_ON_QUEUE'            => 'Posts Awaiting Approval',
+	'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.',
 	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
-	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.',
+	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.  You can remove individual users from the deletion list by unchecking the box next to their username.',
-	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.',
+	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.  You can remove individual users from the deactivation list by unchecking the box next to their username.',
 
-	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here, they will be used in preference to the criteria above. Founders cannot be pruned.',
+	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here.  They will be used in preference to the criteria above. Founders cannot be pruned.',
 
 	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
 	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',