diff --git a/phpBB/adm/admin_users.php b/phpBB/adm/admin_users.php index 1237c262e3..48e14eee09 100644 --- a/phpBB/adm/admin_users.php +++ b/phpBB/adm/admin_users.php @@ -28,22 +28,28 @@ define('IN_PHPBB', 1); $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require('pagestart.' . $phpEx); +include($phpbb_root_path.'includes/functions_user.'.$phpEx); - -// Set mode +// +// Get and set basic vars +// $mode = request_var('mode', ''); $action = request_var('action', 'overview'); $username = request_var('username', ''); $user_id = request_var('u', 0); $ip = request_var('ip', ''); $start = request_var('start', 0); - $delete = request_var('delete', ''); +$quicktools = request_var('quicktools', ''); +$submit = (isset($_POST['update'])) ? true : false; +$confirm = (isset($_POST['confirm'])) ? true : false; +$cancel = (isset($_POST['cancel'])) ? true : false; -// Set some vars $error = array(); -// Whois? +// +// Whois output +// if ($action == 'whois') { // Output relevant page @@ -79,87 +85,465 @@ if ($action == 'whois') adm_page_footer(); } +// +// Obtain user information if appropriate +// +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"; + $result = $db->sql_query($sql); + + if (!extract($db->sql_fetchrow($result))) + { + trigger_error($user->lang['NO_USER']); + } + $db->sql_freeresult($result); + + if ($session_time > $user_lastvisit) + { + $user_lastvisit = $session_time; + $user_lastpage = $session_page; + } + + $user_password = ''; +} + +// Output page +adm_page_header($user->lang['MANAGE']); + +// +// User has submitted a form, process it +// +if ($submit) +{ + 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) + { + $db->sql_transaction(); + + switch ($deletetype) + { + case 'retain': + $sql = 'UPDATE ' . FORUMS_TABLE . ' + SET forum_last_poster_id = ' . ANONYMOUS . " + WHERE forum_last_poster_id = $user_id"; + // $db->sql_query($sql); + + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET poster_id = ' . ANONYMOUS . " + WHERE poster_id = $user_id"; + // $db->sql_query($sql); + + $sql = 'UPDATE ' . TOPICS_TABLE . ' + SET topic_poster = ' . ANONYMOUS . " + WHERE topic_poster = $user_id"; + // $db->sql_query($sql); + break; + + case 'remove': + break; + } + + $table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, FORUMS_TRACK_TABLE); + + foreach ($table_ary as $table) + { + $sql = "DELETE FROM $table + WHERE user_id = $user_id"; + // $db->sql_query($sql); + } + + // Reset newest user info if appropriate + if ($config['newest_user_id'] == $user_id) + { + $sql = 'SELECT user_id, username + FROM ' . USERS_TABLE . ' + ORDER BY user_id DESC + LIMIT 1'; + $result = $db->sql_query($sql); + + if ($row = $db->sql_fetchrow($result)) + { + set_config('newest_user_id', $row['user_id']); + set_config('newest_username', $row['username']); + } + $db->freeresult($result); + } + + set_config('num_users', $config['num_users'] - 1, TRUE); + + $db->sql_transaction('commit'); + + 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'; + break; + + case 'banemail': + $ban[] = $user_email; + $reason = 'USER_ADMIN_BAN_EMAIL_REASON'; + 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'; + break; + } + + user_ban(substr($quicktools, 3), $ban, 0, 0, 0, $user->lang[$reason]); + + 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(); + } + + break; + + case 'active': + + user_active_type($user_id, $user_type, false, $username); + + $message = ($user_type == USER_NORMAL) ? 'USER_ADMIN_INACTIVE' : 'USER_ADMIN_ACTIVE'; + trigger_error($user->lang[$message]); + break; + + case 'moveposts': + + if (!($new_forum_id = request_var('new_f', 0))) + { + +?> + +

lang['USER_ADMIN']; ?>

+ +

lang['USER_ADMIN_EXPLAIN']; ?>

+ +
"> + + + + + + + + + +
lang['USER_ADMIN_MOVE_POSTS']; ?>
lang['MOVE_POSTS_EXPLAIN']; ?>

 
+ $new_forum_id + GROUP BY topic_id"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $topic_id_ary[$row['topic_id']] = $row['total_posts']; + } + $db->sql_freeresult($result); + + $sql = 'SELECT topic_id, forum_id, topic_title, topic_replies, topic_replies_real + FROM ' . TOPICS_TABLE . ' + WHERE topic_id IN (' . implode(', ', array_keys($topic_id_ary)) . ')'; + $result = $db->sql_query($sql); + + $move_topic_ary = $move_post_ary = array(); + while ($row = $db->sql_fetchrow($result)) + { + if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']]) + { + $move_topic_ary[] = $row['topic_id']; + } + else + { + $move_post_ary[$row['topic_id']]['title'] = $row['topic_title']; + $move_post_ary[$row['topic_id']]['attach'] = ($row['attach']) ? 1 : 0; + } + + $forum_id_ary[] = $row['forum_id']; + } + $db->sql_freeresult($result); + + // Entire topic comprises posts by this user, move these topics + if (sizeof($move_topic_ary)) + { + move_topics($move_topic_ary, $new_forum_id, false); + } + + if (sizeof($move_post_ary)) + { + // Create new topic + // Update post_ids, report_ids, attachment_ids + foreach ($move_post_ary as $topic_id => $post_ary) + { + // Create new topic + $sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', array( + 'topic_poster' => $user_id, + 'topic_time' => time(), + 'forum_id' => $new_forum_id, + 'icon_id' => 0, + 'topic_approved' => 1, + 'topic_title' => $post_ary['title'], + 'topic_first_poster_name' => $username, + 'topic_type' => POST_NORMAL, + 'topic_time_limit' => 0, + 'topic_attachment' => $post_ary['attach'],) + ); + $db->sql_query($sql); + + $new_topic_id = $db->sql_nextid(); + + // Move posts + $sql = 'UPDATE ' . POSTS_TABLE . " + SET forum_id = $new_forum_id, topic_id = $new_topic_id + WHERE topic_id = $topic_id + AND poster_id = $user_id"; + $db->sql_query($sql); + + if ($post_ary['attach']) + { + $sql = 'UPDATE ' . ATTACHMENTS_TABLE . " + SET topic_id = $new_topic_id + WHERE topic_id = $topic_id + AND poster_id = $user_id"; + $db->sql_query($sql); + } + + $new_topic_id_ary[] = $new_topic_id; + } + } + + $forum_id_ary = array_unique($forum_id_ary); + $topic_id_ary = array_unique(array_merge($topic_id_ary, $new_topic_id_ary)); + + sync('reported', 'topic_id', $topic_id_ary); + sync('topic', 'topic_id', $topic_id_ary); + sync('forum', 'forum_id', $forum_id_ary); + } + + break; + } + + trigger_error($message); + } + + // Handle registration info updates + $var_ary = array( + 'username' => (string) $username, + 'user_founder' => (int) $user_founder, + 'user_type' => (int) $user_type, + 'user_email' => (string) $user_email, + 'email_confirm' => (string) '', + 'user_password' => (string) '', + 'password_confirm' => (string) '', + 'user_warnings' => (int) $user_warnings, + ); + + foreach ($var_ary as $var => $default) + { + $data[$var] = request_var($var, $default); + } + + $var_ary = array( + 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), + 'user_password' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), + 'user_email' => array( + array('string', false, 6, 60), + array('email', $email)), + 'email_confirm' => array('string', true, 6, 60), + 'user_warnings' => array('num', 0, $config['max_warnings']), + ); + + // Check username if altered + if ($username != $data['username']) + { + $var_ary += array( + 'username' => array( + array('string', false, $config['min_name_chars'], $config['max_name_chars']), + array('username', $username)), + ); + } + + $error = validate_data($data, $var_ary); + + if ($data['user_password'] && $data['password_confirm'] != $data['user_password']) + { + $error[] = 'NEW_PASSWORD_ERROR'; + } + + if ($user_email != $data['user_email'] && $data['email_confirm'] != $data['user_email']) + { + $error[] = 'NEW_EMAIL_ERROR'; + } + + // Which updates do we need to do? + $update_warning = ($user_warnings != $data['user_warnings']) ? true : false; + $update_username = ($username != $data['username']) ? $username : false; + $update_password = ($user_password != $data['user_password']) ? true : false; + + extract($data); + unset($data); + + if (!sizeof($error)) + { + $sql_ary = array( + 'username' => $username, + 'user_founder' => $user_founder, + 'user_email' => $user_email, + 'user_email_hash' => crc32(strtolower($user_email)) . strlen($user_email), + 'user_warnings' => $user_warnings, + ); + + if ($update_password) + { + $sql_ary += array( + 'user_password' => md5($user_password), + 'user_passchg' => time(), + ); + } + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . $user->data['user_id']; + $db->sql_query($sql); + + if ($update_warning) + { + } + + if ($update_username) + { + user_update_name($update_username, $username); + } + + trigger_error($user->lang['USER_OVERVIEW_UPDATED']); + } + + // Replace "error" strings with their real, localised form + $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); + + break; + + } +} + +// +// Output forms +// // Begin program if ($username || $user_id) { - if ($submit) - { - // Update entry in DB - if ($delete && $user_type != USER_FOUNDER) - { - if (!$auth->acl_get('a_userdel')) - { - trigger_error($user->lang['NO_ADMIN']); - } - - $db->sql_transaction(); - - if ($deletetype == 'retain') - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET poster_id = ' . ANONYMOUS . " - WHERE poster_id = $user_id"; - // $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_poster = ' . ANONYMOUS . " - WHERE topic_poster = $user_id"; - // $db->sql_query($sql); - } - else - { - } - - $table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE); - - foreach ($table_ary as $table) - { - $sql = "DELETE FROM $table - WHERE user_id = $user_id"; -// $db->sql_query($sql); - } - - $db->sql_transaction('commit'); - - trigger_error($user->lang['USER_DELETED']); - } - } - else - { - $session_time = 0; - $sql_where = ($username) ? "username = '" . $db->sql_escape($username) . "'" : "user_id = $user_id"; - $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"; - $result = $db->sql_query($sql); - - if (!extract($db->sql_fetchrow($result))) - { - trigger_error($user->lang['NO_USER']); - } - $db->sql_freeresult($result); - - if ($session_time > $user_lastvisit) - { - $user_lastvisit = $session_time; - $user_lastpage = $session_page; - } - } - - // Generate overall "header" for user admin - $view_options = ''; - foreach (array('overview' => 'MAIN', 'feedback' => 'FEEDBACK', 'profile' => 'PROFILE', 'prefs' => 'PREFS', 'avatar' => 'AVATAR', 'sig' => 'SIG', 'groups' => 'GROUP', 'perm' => 'PERM') as $value => $lang) + $form_options = ''; + $forms_ary = array('overview' => 'OVERVIEW', 'feedback' => 'FEEDBACK', 'profile' => 'PROFILE', 'prefs' => 'PREFS', 'avatar' => 'AVATAR', 'sig' => 'SIG', 'groups' => 'GROUP', 'perm' => 'PERM'); + + foreach ($forms_ary as $value => $lang) { $selected = ($action == $value) ? ' selected="selected"' : ''; - $view_options .= ''; + $form_options .= ''; } $pagination = ''; - - // Output page - adm_page_header($user->lang['MANAGE']); - ?>

lang['USER_ADMIN']; ?>

@@ -168,21 +552,42 @@ if ($username || $user_id) "> - +
Select view: lang['SELECT_FORM']; ?>:
- + + + + +' . 'Select option' . ''; - foreach (array('banuser' => 'BAN_USER', 'banemail' => 'BAN_EMAIL', 'banip' => 'BAN_IP', 'force' => 'FORCE', 'active' => (($user_type == USER_INACTIVE) ? 'ACTIVATE' : 'DEACTIVATE'), 'moveposts' => 'MOVE_POSTS') as $value => $lang) + $user_char_ary = array('.*' => 'USERNAME_CHARS_ANY', '[\w]+' => 'USERNAME_ALPHA_ONLY', '[\w_\+\. \-\[\]]+' => 'USERNAME_ALPHA_SPACERS'); + $quick_tool_ary = array('banuser' => 'BAN_USER', 'banemail' => 'BAN_EMAIL', 'banip' => 'BAN_IP', 'active' => (($user_type == USER_INACTIVE) ? 'ACTIVATE' : 'DEACTIVATE'), 'moveposts' => 'MOVE_POSTS'); + if ($config['email_enable']) + { + $quick_tool_ary['reactivate'] = 'FORCE'; + } + + asort($quick_tool_ary); + + $options = ''; + foreach ($quick_tool_ary as $value => $lang) { $options .= ''; } @@ -192,28 +597,51 @@ if ($username || $user_id) ?> - + - - + + + + + + + + + + + + - + + + + + - - + + - + - - + + - - + - - + + + + + + + + + + - - - - - - -acl_get('a_user')) trigger_error($user->lang['No_admin']); } -adm_page_header($user->lang['MANAGE']); - ?>

lang['USER_ADMIN']; ?>

@@ -754,10 +1149,6 @@ adm_page_header($user->lang['MANAGE']); - diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index ae3a111c53..742108ec78 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -69,12 +69,12 @@ function user_get_id_name(&$user_id_ary, &$username_ary) // Updates a username across all relevant tables/fields function user_update_name($old_name, $new_name) { - global $db; + global $config, $db; $update_ary = array( FORUMS_TABLE => array('forum_last_poster_name'), MODERATOR_TABLE => array('username'), - POSTS_TABLE => array('poster_username'), + POSTS_TABLE => array('post_username'), TOPICS_TABLE => array('topic_first_poster_name', 'topic_last_poster_name'), ); @@ -89,18 +89,92 @@ function user_update_name($old_name, $new_name) } } - $sql = 'UPDATE ' . CONFIG_TABLE . " - SET config_value = '" . $new_name . "' - WHERE config_name = 'newest_username' - AND config_value = '" . $old_name . "'"; + if ($config['newest_username'] == $old_name) + { + set_config('newest_username', $new_name); + } +} + +// Flips user_type from active to inactive and vice versa, handles +// group membership updates +function user_active_flip($user_id, $user_type, $user_actkey = false, $username = false) +{ + global $db, $user, $auth; + + $sql = 'SELECT group_id, group_name + FROM ' . GROUPS_TABLE . " + WHERE group_name IN ('REGISTERED', 'REGISTERED_COPPA', 'INACTIVE', 'INACTIVE_COPPA')"; + $result = $db->sql_query($sql); + + $group_id_ary = array(); + while ($row = $db->sql_fetchrow($result)) + { + $group_id_ary[$row['group_name']] = $row['group_id']; + } + $db->sql_freeresult($result); + + $sql = 'SELECT group_id + FROM ' . USER_GROUP_TABLE . " + WHERE user_id = $user_id"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + if ($group_name = array_search($row['group_id'], $group_id_ary)) + { + break; + } + } + $db->sql_freeresult($result); + + $current_group = ($user_type == USER_NORMAL) ? 'REGISTERED' : 'INACTIVE'; + $switch_group = ($user_type == USER_NORMAL) ? 'INACTIVE' : 'REGISTERED'; + + $new_group_id = $group_id_ary[str_replace($current_group, $switch_group, $group_name)]; + + $sql = 'UPDATE ' . USER_GROUP_TABLE . " + SET group_id = $new_group_id + WHERE user_id = $user_id + AND group_id = " . $group_id_ary[$group_name]; $db->sql_query($sql); + + $sql_update = ($group_id == $group_id_ary[$group_name]) ? ", group_id = $new_group_id" : ''; + $sql_update .= ($user_actkey) ? ", user_actkey = '$user_actkey'" : ''; + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_type = ' . (($user_type == USER_NORMAL) ? USER_INACTIVE : USER_NORMAL) . "$sql_update + WHERE user_id = $user_id"; + $db->sql_query($sql); + + $auth->acl_clear_prefetch($user_id); + + if (!function_exists('add_log')) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); + } + + if (!$username) + { + $sql = 'SELECT username + FROM ' . USERS_TABLE . " + WHERE user_id = $user_id"; + $result = $db->sql_query($sql); + + extract($db->sql_fetchrow($result)); + $db->sql_freeresult($result); + } + + $log = ($user_type == USER_NORMAL) ? 'LOG_USER_INACTIVE' : 'LOG_USER_ACTIVE'; + add_log('admin', $log, $username); + + return false; } function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason) { global $db, $user, $auth; - // Delete stable bans + // Delete stale bans $sql = "DELETE FROM " . BANLIST_TABLE . " WHERE ban_end < " . time() . " AND ban_end <> 0"; @@ -377,7 +451,7 @@ function user_unban($mode, $ban) { global $db, $user, $auth; - // Delete stable bans + // Delete stale bans $sql = "DELETE FROM " . BANLIST_TABLE . " WHERE ban_end < " . time() . " AND ban_end <> 0"; diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index b08d750cf2..db19cbaf65 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -102,6 +102,9 @@ $lang += array( 'log_index_delete' => 'Deleted inactive users
» %s', 'LOG_INDEX_REMIND' => 'Sent reminder emails to inactive users
» %s', + 'LOG_USER_INACTIVE' => 'User deactivated
» %s', + 'LOG_USER_ACTIVE' => 'User activated
» %s', + 'LOG_MASS_EMAIL' => 'Sent mass email
» %s', 'LOG_MAIL_SESSION' => 'Logged Mail Session
» %s', @@ -1027,7 +1030,8 @@ $lang += array( 'Admin_user_updated' => 'The users profile was successfully updated.', - 'USER_ADMIN_MAIN' => 'Overview', + 'SELECT_FORM' => 'Select form', + 'USER_ADMIN_OVERVIEW' => 'Overview', 'USER_ADMIN_FEEDBACK' => 'Feedback', 'USER_ADMIN_PROFILE' => 'Profile', 'USER_ADMIN_PREFS' => 'Preferences', @@ -1036,6 +1040,20 @@ $lang += array( 'USER_ADMIN_GROUP' => 'Groups', 'USER_ADMIN_PERM' => 'Permissions', + 'FOUNDER' => 'Founder', + 'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members', + 'USER_INFO' => 'Basic information', + 'REGISTERED' => 'Registered', + 'REGISTERED_IP' => 'Registered from IP', + 'LAST_ACTIVE' => 'Last active', + 'WARNINGS' => 'Warnings', + 'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.', + 'USER_TOOLS' => 'Basic tools', + 'QUICK_TOOLS' => 'Quick tools', + 'DELETE_USER' => 'Delete users', + 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered', + 'RETAIN_POSTS' => 'Retain posts', + 'DELETE_POSTS' => 'Delete posts', 'USER_ADMIN_BAN_USER' => 'Ban by username', 'USER_ADMIN_BAN_EMAIL' => 'Ban by email', 'USER_ADMIN_BAN_IP' => 'Ban by IP', @@ -1043,15 +1061,16 @@ $lang += array( 'USER_ADMIN_DEACTIVATE' => 'Deactivate account', 'USER_ADMIN_ACTIVATE' => 'Activate account', 'USER_ADMIN_MOVE_POSTS' => 'Move all posts', + 'MOVE_POSTS_EXPLAIN' => 'Please select the forum to which you wish to move all the posts this user has made.', - 'User_delete' => 'Delete this user', - 'User_delete_explain' => 'Click here to delete this user, this cannot be undone.', - 'User_deleted' => 'User was successfully deleted.', - 'User_status' => 'User is active', - 'User_allowpm' => 'Can send Private Messages', - 'User_allowavatar' => 'Can display avatar', - 'Admin_avatar_explain' => 'Here you can see and delete the users current avatar.', + 'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management', + 'USER_ADMIN_BAN_IP_REASON' => 'IP banned via user management', + 'USER_ADMIN_BAN_EMAIL_REASON' => 'Email address banned via user management', + 'USER_DELETED' => 'User deleted successfully', + 'USER_OVERVIEW_UPDATED' => 'User details updated', + 'USER_ADMIN_INACTIVE' => 'User deactivated successfully.', + 'USER_ADMIN_ACTIVE' => 'User activated successfully.', ); // Group admin diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 05b60ce7fa..35d3115a97 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -849,6 +849,8 @@ $lang += array( 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', 'EMAIL_TAKEN_EMAIL' => 'The email address you specified is already in use, please select an alternative.', + 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', + 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password', 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
lang['USER_ADMIN_' . $action]; ?>lang['USER_ADMIN_' . strtoupper($action)]; ?>
', $error); ?>
Username: lang['USERNAME']; ?>:
lang[$user_char_ary[str_replace('\\\\', '\\', $config['allow_name_chars'])] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']); ?>
Founder:
Founders can never be banned, deleted or altered by non-founder members		 />lang['YES']; ?>  />lang['NO']; ?>lang['REGISTERED']; ?>: format_date($user_regdate); ?>
lang['REGISTERED_IP']; ?>: ' . (($ip == 'hostname') ? gethostbyaddr($user_ip) : $user_ip) . " [ " . $user->lang['WHOIS'] . ' ]'; ?>
lang['LAST_ACTIVE']; ?>: format_date($user_lastvisit); ?>
Email: lang['FOUNDER']; ?>:
lang['FOUNDER_EXPLAIN']; ?>		 />lang['YES']; ?>  />lang['NO']; ?>
lang['EMAIL']; ?>:
Confirm Email:
Only required if changing the email address		lang['CONFIRM_EMAIL']; ?>:
lang['CONFIRM_EMAIL_EXPLAIN']; ?>
New password: lang['NEW_PASSWORD']; ?>:
lang['CHANGE_PASSWORD_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']) ?>
Confirm password:
Only required if changing the email address		lang['CONFIRM_PASSWORD']; ?>:
lang['CONFIRM_PASSWORD_EXPLAIN']; ?>
Quick tools: lang['USER_TOOLS']; ?>
Delete user:
Please note that deleting a user is final, it cannot be recovered		 lang['WARNINGS']; ?>:
lang['WARNINGS_EXPLAIN']; ?>
lang['QUICK_TOOLS']; ?>:
lang['DELETE_USER']; ?>:
lang['DELETE_USER_EXPLAIN']; ?>
Background
- - - - - - - - - - - - - - - - - - - - -
Registered: format_date($user_regdate); ?>
Registration IP: $user_ip" : 'Unknown'; - -?>
Last active: format_date($user_lastvisit); ?>
Karma level: lang['KARMA_LEVEL'] . ': ' . $user->lang['KARMA'][$user_karma] . '" title="' . $user->lang['KARMA_LEVEL'] . ': ' . $user->lang['KARMA'][$user_karma] . '" /> [ ' . $user->lang['KARMA'][$user_karma] . ' ]' : ''; - -?>
Warnings:
Lookup existing user:
[ " onclick="window.open('', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">lang['FIND_USERNAME']; ?> ]