mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 15:16:16 +02:00
Fix bug #487716
git-svn-id: file:///svn/phpbb/trunk@1501 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
76f722573b
commit
828a00bc52
@ -140,9 +140,9 @@ if( isset($HTTP_POST_VARS['submit']) )
|
||||
}
|
||||
|
||||
$email_list = array();
|
||||
if(isset($HTTP_POST_VARS['ban_mail']))
|
||||
if(isset($HTTP_POST_VARS['ban_email']))
|
||||
{
|
||||
$email_list_temp = explode(",", $HTTP_POST_VARS['ban_mail']);
|
||||
$email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
|
||||
|
||||
for($i = 0; $i < count($email_list_temp); $i++)
|
||||
{
|
||||
@ -328,7 +328,9 @@ if( isset($HTTP_POST_VARS['submit']) )
|
||||
}
|
||||
}
|
||||
|
||||
message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
|
||||
$message = $lang['Ban_update_sucessful'] . "<br /><br />" . sprintf($lang['Click_return_banadmin'], "<a href=\"" . append_sid("admin_user_ban.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
|
||||
|
||||
message_die(GENERAL_MESSAGE, $message);
|
||||
|
||||
}
|
||||
else
|
||||
@ -365,7 +367,8 @@ else
|
||||
$select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
|
||||
$userban_count++;
|
||||
}
|
||||
$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist . "</select>";
|
||||
$select_size = ( $userban_count < 5 || $userban_c) ? 5 :
|
||||
$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist . "</select>";
|
||||
|
||||
$template->assign_vars(array(
|
||||
"L_BAN_USER" => $lang['Ban_username'],
|
||||
@ -402,12 +405,8 @@ else
|
||||
{
|
||||
$select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
|
||||
}
|
||||
else if($userban_count == 1)
|
||||
{
|
||||
$select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
|
||||
}
|
||||
|
||||
$select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist;
|
||||
$select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist;
|
||||
$select_userlist .= "</select>";
|
||||
|
||||
$sql = "SELECT ban_id, ban_ip, ban_email
|
||||
@ -440,22 +439,14 @@ else
|
||||
{
|
||||
$select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
|
||||
}
|
||||
else if($ipban_count == 1)
|
||||
{
|
||||
$select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
|
||||
}
|
||||
|
||||
if( $select_emaillist == "")
|
||||
{
|
||||
$select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
|
||||
}
|
||||
else if($emailban_count == 1)
|
||||
{
|
||||
$select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
|
||||
}
|
||||
|
||||
$select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"" . min(5, $ipban_count) . "\">" . $select_iplist . "</select>";
|
||||
$select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"" . min(5, $emailban_count) . "\">" . $select_emaillist . "</select>";
|
||||
$select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"5\">" . $select_iplist . "</select>";
|
||||
$select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"5\">" . $select_emaillist . "</select>";
|
||||
|
||||
$template->assign_vars(array(
|
||||
"L_UNBAN_USER" => $lang['Unban_username'],
|
||||
|
@ -217,6 +217,7 @@ $lang['No_banned_ip'] = "No banned IP addresses";
|
||||
$lang['No_banned_email'] = "No banned email addresses";
|
||||
|
||||
$lang['Ban_update_sucessful'] = "The banlist has been updated successfully";
|
||||
$lang['Click_return_banadmin'] = "Click %sHere%s to return to Ban Control";
|
||||
|
||||
|
||||
//
|
||||
|
Loading…
x
Reference in New Issue
Block a user