diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-29 12:30:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-29 12:30:22 +0000 |
| commit | 290187c6c79d069ea669384c515ba38965ff1002 (patch) | |
| tree | b19f7a3ee1413b8405cbf9e3ce221a19080491ea /phpBB/includes/acp/acp_users.php | |
| parent | c262c4addbb8d18fdd3a84d0a4b64dd9899320c0 (diff) | |
| download | forums-290187c6c79d069ea669384c515ba38965ff1002.tar forums-290187c6c79d069ea669384c515ba38965ff1002.tar.gz forums-290187c6c79d069ea669384c515ba38965ff1002.tar.bz2 forums-290187c6c79d069ea669384c515ba38965ff1002.tar.xz forums-290187c6c79d069ea669384c515ba38965ff1002.zip | |
more bugfixing. Important change: admins able to give ban reason for user quick tool ban - logging also syndicated, now always logged to ACP and MCP logs.
git-svn-id: file:///svn/phpbb/trunk@7426 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index fd76f0ee35..db6c1f83e3 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -147,7 +147,9 @@ class acp_users switch ($mode) { case 'overview': - + + $user->add_lang('acp/ban'); + $delete = request_var('delete', 0); $delete_type = request_var('delete_type', ''); $ip = request_var('ip', 'ip'); @@ -246,10 +248,11 @@ class acp_users break; } - user_ban(substr($action, 3), $ban, 0, 0, 0, $user->lang[$reason]); + $ban_reason = request_var('ban_reason', $user->lang[$reason], true); + $ban_give_reason = request_var('ban_give_reason', '', true); - add_log('admin', $log, $user->lang[$reason], implode(', ', $ban)); - add_log('user', $user_id, $log, $user->lang[$reason], implode(', ', $ban)); + // Log not used at the moment, we simply utilize the ban function. + user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason); trigger_error($user->lang['BAN_SUCCESSFUL'] . adm_back_link($this->u_action . '&u=' . $user_id)); @@ -837,8 +840,7 @@ class acp_users 'USER_WARNINGS' => $user_row['user_warnings'], 'USER_POSTS' => $user_row['user_posts'], 'USER_INACTIVE_REASON' => $inactive_reason, - ) - ); + )); break; |