mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

merge

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8575 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2008-05-29 14:07:55 +00:00
parent 8ce9e1b852
commit 98dadd5eb8
6 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
phpBB/includes/mcp/mcp_ban.php
View File

@@ -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);
}
}
}