diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-03 00:56:48 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-12-03 00:56:48 +0000 |
| commit | 828a00bc522bf8d15bb2693975f717f31d1d2e1f (patch) | |
| tree | 71ab9039a7f0043d26987081c010afd19e8f792b /phpBB/admin | |
| parent | 76f722573b0bc6f22a6ac36645a2a18e34b09fe1 (diff) | |
| download | forums-828a00bc522bf8d15bb2693975f717f31d1d2e1f.tar forums-828a00bc522bf8d15bb2693975f717f31d1d2e1f.tar.gz forums-828a00bc522bf8d15bb2693975f717f31d1d2e1f.tar.bz2 forums-828a00bc522bf8d15bb2693975f717f31d1d2e1f.tar.xz forums-828a00bc522bf8d15bb2693975f717f31d1d2e1f.zip | |
Fix bug #487716
git-svn-id: file:///svn/phpbb/trunk@1501 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_user_ban.php | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php index e247e69bb4..b99d0025fa 100644 --- a/phpBB/admin/admin_user_ban.php +++ b/phpBB/admin/admin_user_ban.php @@ -44,7 +44,7 @@ if( isset($HTTP_POST_VARS['submit']) ) $ip_bansql = ""; $user_list = array(); - if(isset($HTTP_POST_VARS['ban_user'])) + if( isset($HTTP_POST_VARS['ban_user']) ) { $user_list_temp = $HTTP_POST_VARS['ban_user']; @@ -55,7 +55,7 @@ if( isset($HTTP_POST_VARS['submit']) ) } $ip_list = array(); - if(isset($HTTP_POST_VARS['ban_ip'])) + if( isset($HTTP_POST_VARS['ban_ip']) ) { $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']); @@ -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'], @@ -398,16 +401,12 @@ else $userban_count++; } - if($select_userlist == "") + if( $select_userlist == "" ) { $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 == "") + 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'], |