diff options
| author | jellydoughnut <a_jelly_doughnut@phpbb.com> | 2011-12-12 20:17:31 -0600 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-01-06 02:59:09 -0500 |
| commit | a1fee699dda3d28b22a5b18f8940c104b5e441d8 (patch) | |
| tree | df830ce643584a18c228b2c5fefa88e221180ed8 /phpBB/includes/acp/acp_prune.php | |
| parent | 9f32cae5f9b4e3524dd82be266ed638152920ebb (diff) | |
| download | forums-a1fee699dda3d28b22a5b18f8940c104b5e441d8.tar forums-a1fee699dda3d28b22a5b18f8940c104b5e441d8.tar.gz forums-a1fee699dda3d28b22a5b18f8940c104b5e441d8.tar.bz2 forums-a1fee699dda3d28b22a5b18f8940c104b5e441d8.tar.xz forums-a1fee699dda3d28b22a5b18f8940c104b5e441d8.zip | |
[feature/prune-users] Minor UI adjustment and bug fixes
Removed unneeded hidden fields in confirmation page. Do not show group prune
dropdown if there are no groups, etc.
PHPBB3-9622
Diffstat (limited to 'phpBB/includes/acp/acp_prune.php')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index a21805972f..b10eb292d2 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -245,7 +245,6 @@ class acp_prune $user_ids = $usernames = array(); $this->get_prune_users($user_ids, $usernames); - if (sizeof($user_ids)) { if ($action == 'deactivate') @@ -311,17 +310,7 @@ class acp_prune 'mode' => $mode, '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), - 'action' => request_var('action', ''), )), 'confirm_body_prune.html'); } @@ -343,7 +332,7 @@ class acp_prune $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 . ' WHERE group_type <> ' . GROUP_SPECIAL . ' ORDER BY group_name ASC'; @@ -372,6 +361,8 @@ class acp_prune $users_by_name = request_var('users', '', true); $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) { @@ -399,7 +390,6 @@ class acp_prune $active = request_var('active', ''); $count = request_var('count', 0); - $posts_on_queue = request_var('posts_on_queue', 0); $active = ($active) ? explode('-', $active) : array(); $joined_before = ($joined_before) ? explode('-', $joined_before) : array(); @@ -424,7 +414,7 @@ class acp_prune } 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 |