From 1a9142c4c5a74a6b735901d8d70867614613c970 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Thu, 2 Aug 2001 14:02:54 +0000
Subject: [PATCH] A few updates, nothing major

git-svn-id: file:///svn/phpbb/trunk@794 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/admin/admin_user_ban.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php
index 706565df6d..d7f650d4df 100644
--- a/phpBB/admin/admin_user_ban.php
+++ b/phpBB/admin/admin_user_ban.php
@@ -1,8 +1,8 @@
 <?php
 /***************************************************************************  
- *                                 
+ *                            admin_user_ban.php   
  *                            -------------------                         
- *   begin                : Saturday, Feb 13, 2001 
+ *   begin                : Tuesday, Jul 31, 2001 
  *   copyright            : (C) 2001 The phpBB Group        
  *   email                : support@phpbb.com                           
  *                                                          
@@ -54,7 +54,9 @@ else if( $userdata['user_level'] != ADMIN )
 	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
 }
 
-
+//
+// Start program
+//
 if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 {
 	include('page_header_admin.'.$phpEx);
@@ -83,7 +85,7 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 
 			for($i = 0; $i < count($ip_list_temp); $i++)
 			{
-				if( ereg("^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$", trim($ip_list_temp[$i]), $ip_range_explode) )
+				if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
 				{
 					//
 					// Don't ask about all this, just don't ask ... !
@@ -142,7 +144,7 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 						$ip_1_counter++;
 					}
 				}
-				else if( eregi("[[:alpha:]]", $ip_list_temp[$i]) )
+				else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
 				{
 					$ip = gethostbynamel(trim($ip_list_temp[$i]));
 
@@ -154,7 +156,7 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
 						}
 					}
 				}
-				else if( ereg("^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$", trim($ip_list_temp[$i])) )
+				else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
 				{
 					$ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
 				}
@@ -431,7 +433,7 @@ else
 		{
 			$select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
 		}
-		else
+		else if($userban_count == 1)
 		{
 			$select_userlist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_userlist;
 		}
@@ -469,7 +471,7 @@ else
 		{
 			$select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
 		}
-		else
+		else if($ipban_count == 1)
 		{
 			$select_iplist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_iplist;
 		}
@@ -478,7 +480,7 @@ else
 		{
 			$select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
 		}
-		else
+		else if($emailban_count == 1)
 		{
 			$select_emaillist = "<option value=\"-1\">" . $lang['No_unban'] . "</option>" . $select_emaillist;
 		}
@@ -518,7 +520,6 @@ else
 
 }
 
-
 $template->pparse("body");
 
 include('page_footer_admin.'.$phpEx);