mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

[feature/prune-users] Minor UI adjustment and bug fixes

Browse Source 
Removed unneeded hidden fields in confirmation page.  Do not show group prune
dropdown if there are no groups, etc.

PHPBB3-9622
This commit is contained in:
jellydoughnut 2011-12-12 20:17:31 -06:00 committed by Oleg Pudeyev
parent 9f32cae5f9
commit a1fee699dd
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_prune_users.html
View File

@ -41,10 +41,12 @@
<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt> <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> <dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>
</dl> </dl>
<!-- IF S_GROUP_LIST -->
<dl> <dl>
<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt> <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> <dd><select name="group_id">{S_GROUP_LIST}</select></dd>
</dl> </dl>
<!-- ENDIF -->
</fieldset> </fieldset>
<fieldset> <fieldset>

18
phpBB/includes/acp/acp_prune.php
View File

@ -245,7 +245,6 @@ class acp_prune
$user_ids = $usernames = array(); $user_ids = $usernames = array();
$this->get_prune_users($user_ids, $usernames); $this->get_prune_users($user_ids, $usernames);
if (sizeof($user_ids)) if (sizeof($user_ids))
{ {
if ($action == 'deactivate') if ($action == 'deactivate')
@ -311,17 +310,7 @@ class acp_prune
'mode' => $mode, 'mode' => $mode,
'prune' => 1, 'prune' => 1,
'users' => request_var('users', '', true),
'username' => request_var('username', '', true),
'email' => request_var('email', ''),
'joined_select' => request_var('joined_select', ''),
'joined' => request_var('joined', ''),
'active_select' => request_var('active_select', ''),
'active' => request_var('active', ''),
'count_select' => request_var('count_select', ''),
'count' => request_var('count', ''),
'deleteposts' => request_var('deleteposts', 0), 'deleteposts' => request_var('deleteposts', 0),
'action' => request_var('action', ''), 'action' => request_var('action', ''),
)), 'confirm_body_prune.html'); )), 'confirm_body_prune.html');
} }
@ -343,7 +332,7 @@ class acp_prune
$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>'; $s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
} }
$s_group_list = '<option value="0" selected="selected">' . $user->lang['SELECT_OPTION'] . '</option>'; $s_group_list = '';
$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . ' $sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . '
WHERE group_type <> ' . GROUP_SPECIAL . ' WHERE group_type <> ' . GROUP_SPECIAL . '
ORDER BY group_name ASC'; ORDER BY group_name ASC';
@ -372,6 +361,8 @@ class acp_prune
$users_by_name = request_var('users', '', true); $users_by_name = request_var('users', '', true);
$users_by_id = request_var('user_ids', array(0)); $users_by_id = request_var('user_ids', array(0));
$group_id = request_var('group_id', 0);
$posts_on_queue = request_var('posts_on_queue', 0);
if ($users_by_name) if ($users_by_name)
{ {
@ -399,7 +390,6 @@ class acp_prune
$active = request_var('active', ''); $active = request_var('active', '');
$count = request_var('count', 0); $count = request_var('count', 0);
$posts_on_queue = request_var('posts_on_queue', 0);
$active = ($active) ? explode('-', $active) : array(); $active = ($active) ? explode('-', $active) : array();
$joined_before = ($joined_before) ? explode('-', $joined_before) : array(); $joined_before = ($joined_before) ? explode('-', $joined_before) : array();
@ -424,7 +414,7 @@ class acp_prune
} }
else if (empty($joined_after) && !empty($joined_before)) 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]); $joined_sql = ' AND user_regdate < ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[0]);
} }
// implicit else when both arrays are empty do nothing // implicit else when both arrays are empty do nothing