diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-05-29 14:07:55 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-05-29 14:07:55 +0000 |
| commit | 98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9 (patch) | |
| tree | 4257abda8eb60d5807da4bc13fd6e93e13c1be57 /phpBB/includes/mcp/mcp_ban.php | |
| parent | 8ce9e1b852bb1a057fda20654c210a91c9afa143 (diff) | |
| download | forums-98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9.tar forums-98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9.tar.gz forums-98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9.tar.bz2 forums-98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9.tar.xz forums-98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8575 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_ban.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index 7289644d39..f63b1a4237 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -150,7 +150,7 @@ class mcp_ban 'U_FIND_USERNAME' => append_sid('memberlist', 'mode=searchuser&form=mcp_ban&field=ban'), )); - if ($mode != 'user') + if ($mode === 'email' && !$auth->acl_get('a_user')) { return; } @@ -162,11 +162,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) @@ -175,13 +188,27 @@ 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); + $template->assign_var('BAN_QUANTIFIER', $pre_fill); } } } |