[Phpbb-checkins] CVS: phpBB2/admin admin_user_ban.php,1.12,1.13

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22391/admin

Modified Files:
	admin_user_ban.php 
Log Message:
Fix bug #487716

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_user_ban.php	2001/11/19 19:06:35	1.12
--- admin_user_ban.php	2001/12/03 00:56:48	1.13
***************
*** 45,49 ****
  
  	$user_list = array();
! 	if(isset($HTTP_POST_VARS['ban_user']))
  	{
  		$user_list_temp = $HTTP_POST_VARS['ban_user'];
--- 45,49 ----
  
  	$user_list = array();
! 	if( isset($HTTP_POST_VARS['ban_user']) )
  	{
  		$user_list_temp = $HTTP_POST_VARS['ban_user'];
***************
*** 56,60 ****
  
  	$ip_list = array();
! 	if(isset($HTTP_POST_VARS['ban_ip']))
  	{
  		$ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
--- 56,60 ----
  
  	$ip_list = array();
! 	if( isset($HTTP_POST_VARS['ban_ip']) )
  	{
  		$ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
***************
*** 141,147 ****
  
  	$email_list = array();
! 	if(isset($HTTP_POST_VARS['ban_mail']))
  	{
! 		$email_list_temp = explode(",", $HTTP_POST_VARS['ban_mail']);
  
  		for($i = 0; $i < count($email_list_temp); $i++)
--- 141,147 ----
  
  	$email_list = array();
! 	if(isset($HTTP_POST_VARS['ban_email']))
  	{
! 		$email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
  
  		for($i = 0; $i < count($email_list_temp); $i++)
***************
*** 329,334 ****
  	}
  
! 	message_die(GENERAL_MESSAGE, $lang['Ban_update_sucessful']);
  
  }
  else
--- 329,336 ----
  	}
  
! 	$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
***************
*** 366,370 ****
  		$userban_count++;
  	}
! 	$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"" . min(5, $userban_count) . "\">" . $select_userlist . "</select>";
  
  	$template->assign_vars(array(
--- 368,373 ----
  		$userban_count++;
  	}
! 	$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(
***************
*** 399,412 ****
  	}
  
! 	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>";
  
--- 402,411 ----
  	}
  
! 	if( $select_userlist == "" )
  	{
  		$select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
  	}
  
! 	$select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist;
  	$select_userlist .= "</select>";
  
***************
*** 441,460 ****
  		$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>";
  
  	$template->assign_vars(array(
--- 440,451 ----
  		$select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
  	}
  
! 	if( $select_emaillist == "") 
  	{
  		$select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
  	}
  
! 	$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(