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

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

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

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

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_user_ban.php	2001/12/03 00:56:48	1.13
--- admin_user_ban.php	2001/12/21 16:58:47	1.14
***************
*** 234,238 ****
  	// ban
  	//
! 	if($kill_session_sql != "")
  	{
  		$sql = "DELETE FROM " . SESSIONS_TABLE . "
--- 234,238 ----
  	// ban
  	//
! 	if( $kill_session_sql != "" )
  	{
  		$sql = "DELETE FROM " . SESSIONS_TABLE . "
***************
*** 249,253 ****
  		for($j = 0; $j < count($current_banlist); $j++)
  		{
! 			if($email_list[$i] == $current_banlist[$j]['ban_email'])
  			{
  				$in_banlist = true;
--- 249,253 ----
  		for($j = 0; $j < count($current_banlist); $j++)
  		{
! 			if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
  			{
  				$in_banlist = true;
***************
*** 255,262 ****
  		}
  
! 		if(!$in_banlist)
  		{
  			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! 				VALUES ('" . $email_list[$i] . "')";
  			if( !$result = $db->sql_query($sql) )
  			{
--- 255,262 ----
  		}
  
! 		if( !$in_banlist )
  		{
  			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
! 				VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
  			if( !$result = $db->sql_query($sql) )
  			{
***************
*** 278,289 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $user_list[$i];
  			}
  		}
  	}
  
! 	if(isset($HTTP_POST_VARS['unban_ip']))
  	{
  		$ip_list = $HTTP_POST_VARS['unban_ip'];
--- 278,289 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $user_list[$i];
  			}
  		}
  	}
  
! 	if( isset($HTTP_POST_VARS['unban_ip']) )
  	{
  		$ip_list = $HTTP_POST_VARS['unban_ip'];
***************
*** 295,306 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $ip_list[$i];
  			}
  		}
  	}
  
! 	if(isset($HTTP_POST_VARS['unban_email']))
  	{
  		$email_list = $HTTP_POST_VARS['unban_email'];
--- 295,306 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $ip_list[$i];
  			}
  		}
  	}
  
! 	if( isset($HTTP_POST_VARS['unban_email']) )
  	{
  		$email_list = $HTTP_POST_VARS['unban_email'];
***************
*** 312,326 ****
  				if($where_sql != "")
  				{
! 					$where_sql .= " OR ";
  				}
! 				$where_sql .= "ban_id = " . $email_list[$i];
  			}
  		}
  	}
  
! 	if($where_sql != "")
  	{
  		$sql = "DELETE FROM " . BANLIST_TABLE . "
! 			WHERE $where_sql";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 312,326 ----
  				if($where_sql != "")
  				{
! 					$where_sql .= ", ";
  				}
! 				$where_sql .= $email_list[$i];
  			}
  		}
  	}
  
! 	if( $where_sql != "" )
  	{
  		$sql = "DELETE FROM " . BANLIST_TABLE . "
! 			WHERE ban_id IN ($where_sql)";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 368,372 ****
  		$userban_count++;
  	}
- 	$select_size = ( $userban_count < 5 || $userban_c) ? 5 : 
  	$select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist . "</select>";
  
--- 368,371 ----