diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-05-29 13:59:47 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-05-29 13:59:47 +0000 |
| commit | bb8a48817c3808729dfdbb0bae86d642907c37e2 (patch) | |
| tree | 8623d3dc106efb8ccd489981d02f340271ae521e /phpBB/includes | |
| parent | a3368632d0a0f3effec49f4f2b7d3b3323f883b4 (diff) | |
| download | forums-bb8a48817c3808729dfdbb0bae86d642907c37e2.tar forums-bb8a48817c3808729dfdbb0bae86d642907c37e2.tar.gz forums-bb8a48817c3808729dfdbb0bae86d642907c37e2.tar.bz2 forums-bb8a48817c3808729dfdbb0bae86d642907c37e2.tar.xz forums-bb8a48817c3808729dfdbb0bae86d642907c37e2.zip | |
What use is a shiny banstick(TM) if nobody finds it?
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8574 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index cb6211abda..5cb1d72a72 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -151,7 +151,7 @@ class mcp_ban 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp_ban&field=ban'), )); - if ($mode != 'user') + if ($mode === 'email' && !$auth->acl_get('a_user')) { return; } @@ -163,11 +163,24 @@ class mcp_ban if ($user_id && $user_id <> ANONYMOUS) { - $sql = 'SELECT username + $sql = 'SELECT username, user_email, user_ip FROM ' . USERS_TABLE . ' WHERE user_id = ' . $user_id; $result = $db->sql_query($sql); - $username = (string) $db->sql_fetchfield('username'); + switch ($mode) + { + case 'user': + $pre_fill = (string) $db->sql_fetchfield('username'); + break; + + case 'ip': + $pre_fill = (string) $db->sql_fetchfield('user_ip'); + break; + + case 'email': + $pre_fill = (string) $db->sql_fetchfield('user_email'); + break; + } $db->sql_freeresult($result); } else if ($post_id) @@ -176,13 +189,29 @@ class mcp_ban if (sizeof($post_info) && !empty($post_info[$post_id])) { - $username = $post_info[$post_id]['username']; + switch ($mode) + { + case 'user': + $pre_fill = $post_info[$post_id]['username']; + break; + + case 'ip': + $pre_fill = $post_info[$post_id]['poster_ip']; + break; + + case 'email': + $pre_fill = $post_info[$post_id]['user_email']; + break; + } + } } - if ($username) + if ($pre_fill) { - $template->assign_var('USERNAMES', $username); + // left for legacy template compatibility + $template->assign_var('USERNAMES', $pre_fill); + $template->assign_var('BAN_QUANTIFIER', $pre_fill); } } } |