diff --git a/phpBB/adm/admin_users.php b/phpBB/adm/admin_users.php
index 9cefdaeb78..cf5186c45b 100644
--- a/phpBB/adm/admin_users.php
+++ b/phpBB/adm/admin_users.php
@@ -34,11 +34,14 @@ include($phpbb_root_path.'includes/functions_profile_fields.'.$phpEx);
//
// Get and set basic vars
//
-$mode = request_var('mode', '');
-$action = request_var('action', 'overview');
-$start = request_var('start', 0);
+$mode = request_var('mode', 'overview');
+$action = request_var('action', '');
+
$username = request_var('username', '');
$user_id = request_var('u', 0);
+$gid = request_var('g', 0);
+
+$start = request_var('start', 0);
$ip = request_var('ip', '');
$start = request_var('start', 0);
$delete = request_var('delete', '');
@@ -46,6 +49,10 @@ $deletetype = request_var('deletetype', '');
$marked = request_var('mark', 0);
$quicktools = request_var('quicktools', '');
+$st = request_var('st', 0);
+$sk = request_var('sk', 'a');
+$sd = request_var('sd', 'd');
+
$submit = (isset($_POST['update'])) ? true : false;
$confirm = (isset($_POST['confirm'])) ? true : false;
$cancel = (isset($_POST['cancel'])) ? true : false;
@@ -54,6 +61,7 @@ $deletemark = (isset($_POST['delmarked'])) ? true : false;
$deleteall = (isset($_POST['delall'])) ? true : false;
$error = array();
+$colspan = 0;
//
// Whois output
@@ -100,7 +108,7 @@ if ($username || $user_id)
{
$session_time = 0;
$sql_where = ($user_id) ? "user_id = $user_id" : "username = '" . $db->sql_escape($username) . "'";
- $sql = ($action == 'overview') ? 'SELECT u.*, s.session_time, s.session_page, s.session_ip FROM (' . USERS_TABLE . ' u LEFT JOIN ' . SESSIONS_TABLE . " s ON s.session_user_id = u.user_id) WHERE u.$sql_where ORDER BY s.session_time DESC LIMIT 1" : 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where";
+ $sql = ($action == 'overview') ? 'SELECT u.*, s.session_time, s.session_page, s.session_ip FROM (' . USERS_TABLE . ' u LEFT JOIN ' . SESSIONS_TABLE . " s ON s.session_user_id = u.user_id) WHERE u.$sql_where ORDER BY s.session_time DESC" : 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where";
$result = $db->sql_query($sql);
if (!extract($db->sql_fetchrow($result)))
@@ -121,779 +129,6 @@ if ($username || $user_id)
// Output page
adm_page_header($user->lang['MANAGE']);
-//
-// User has submitted a form, process it
-//
-if ($submit || $preview || $deleteall || $deletemark)
-{
- switch ($action)
- {
- case 'overview':
-
- if ($delete && $user_type != USER_FOUNDER)
- {
- if (!$auth->acl_get('a_userdel'))
- {
- trigger_error($user->lang['NO_ADMIN']);
- }
-
- if (!$cancel && !$confirm)
- {
- adm_page_confirm($user->lang['CONFIRM'], $user->lang['CONFIRM_OPERATION']);
- }
- else if (!$cancel)
- {
- user_delete($deletetype, $user_id);
-
- add_log('admin', 'LOG_USER_DELETED', $username);
- trigger_error($user->lang['USER_DELETED']);
- }
- }
-
- // Handle quicktool actions
- if ($quicktools && $user_type != USER_FOUNDER)
- {
- switch ($quicktools)
- {
- case 'banuser':
- case 'banemail':
- case 'banip':
- $ban = array();
-
- switch ($quicktools)
- {
- case 'banuser':
- $ban[] = $username;
- $reason = 'USER_ADMIN_BAN_NAME_REASON';
- $log = 'LOG_BAN_USERNAME_USER';
- break;
-
- case 'banemail':
- $ban[] = $user_email;
- $reason = 'USER_ADMIN_BAN_EMAIL_REASON';
- $log = 'LOG_BAN_EMAIL_USER';
- break;
-
- case 'banip':
- $ban[] = $user_ip;
-
- $sql = 'SELECT DISTINCT poster_ip
- FROM ' . POSTS_TABLE . "
- WHERE poster_id = $user_id";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $ban[] = $row['poster_ip'];
- }
- $db->sql_freeresult($result);
-
- $reason = 'USER_ADMIN_BAN_IP_REASON';
- $log = 'LOG_BAN_IP_USER';
- break;
- }
-
- user_ban(substr($quicktools, 3), $ban, 0, 0, 0, $user->lang[$reason]);
-
- add_log('user', $user_id, $log);
-
- trigger_error($user->lang['BAN_UPDATE_SUCESSFUL']);
-
- break;
-
- case 'reactivate':
-
- if ($config['email_enable'])
- {
- include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
-
- $user_actkey = gen_rand_string(10);
- $key_len = 54 - (strlen($server_url));
- $key_len = ($key_len > 6) ? $key_len : 6;
- $user_actkey = substr($user_actkey, 0, $key_len);
-
- user_active_flip($user_id, $user_type, $user_actkey, $username);
-
- $messenger = new messenger();
-
- $messenger->template('user_welcome_inactive', $user_lang);
- $messenger->subject();
-
- $messenger->replyto($config['board_contact']);
- $messenger->to($user_email, $username);
-
- $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
- $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
- $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
- $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
-
- $messenger->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
- 'USERNAME' => $username,
- 'PASSWORD' => $password_confirm,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']),
-
- 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
- );
-
- $messenger->send(NOTIFY_EMAIL);
- $messenger->queue->save();
-
- add_log('admin', 'LOG_USER_REACTIVATE', $username);
- add_log('user', $user_id, 'LOG_USER_REACTIVATE_USER');
-
- trigger_error($user->lang['USER_ADMIN_REACTIVATE']);
- }
-
- break;
-
- case 'active':
-
- user_active_flip($user_id, $user_type, false, $username);
-
- $message = ($user_type == USER_NORMAL) ? 'USER_ADMIN_INACTIVE' : 'USER_ADMIN_ACTIVE';
- $log = ($user_type == USER_NORMAL) ? 'LOG_USER_INACTIVE' : 'LOG_USER_ACTIVE';
-
- add_log('admin', $log, $username);
- add_log('user', $user_id, $log . '_USER');
-
- trigger_error($user->lang[$message]);
- break;
-
- case 'moveposts':
-
- if (!($new_forum_id = request_var('new_f', 0)))
- {
-
-?>
-
-
lang['USER_ADMIN_EXPLAIN']; ?>
- -