aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_ban.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-08-06 23:58:27 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-08-06 23:58:27 +0000
commitd299df3b256f77d5205630849354fad61e8762ed (patch)
treee11748b6268463a4a15527a87054f7c4eceae6c7 /phpBB/admin/admin_ban.php
parent6e6c85b9b7f43723d2b113736a5ff109e655fe05 (diff)
downloadforums-d299df3b256f77d5205630849354fad61e8762ed.tar
forums-d299df3b256f77d5205630849354fad61e8762ed.tar.gz
forums-d299df3b256f77d5205630849354fad61e8762ed.tar.bz2
forums-d299df3b256f77d5205630849354fad61e8762ed.tar.xz
forums-d299df3b256f77d5205630849354fad61e8762ed.zip
Various updates ...
git-svn-id: file:///svn/phpbb/trunk@2831 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin/admin_ban.php')
-rw-r--r--phpBB/admin/admin_ban.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/admin/admin_ban.php b/phpBB/admin/admin_ban.php
index 7123d3db20..3214c38589 100644
--- a/phpBB/admin/admin_ban.php
+++ b/phpBB/admin/admin_ban.php
@@ -146,7 +146,7 @@ if ( isset($HTTP_POST_VARS['bansubmit']) )
$ip_2_counter = 256;
$ip_2_fragment = 256;
- $banlist[] = "'$ip_1_counter.'";
+ $banlist[] = "'$ip_1_counter.*'";
}
while ( $ip_2_counter <= $ip_2_end )
@@ -159,7 +159,7 @@ if ( isset($HTTP_POST_VARS['bansubmit']) )
$ip_3_counter = 256;
$ip_3_fragment = 256;
- $banlist[] = "'$ip_1_counter.$ip_2_counter.'";
+ $banlist[] = "'$ip_1_counter.$ip_2_counter.*'";
}
while ( $ip_3_counter <= $ip_3_end )
@@ -172,7 +172,7 @@ if ( isset($HTTP_POST_VARS['bansubmit']) )
$ip_4_counter = 256;
$ip_4_fragment = 256;
- $banlist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.'";
+ $banlist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'";
}
while ( $ip_4_counter <= $ip_4_end )
@@ -199,9 +199,9 @@ if ( isset($HTTP_POST_VARS['bansubmit']) )
}
}
}
- else if ( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ban_list[$i])) )
+ else if ( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ban_list[$i])) || preg_match('/^[a-f0-9:]+\*?$/i', trim($ban_list[$i])) )
{
- $banlist[] = '\'' . str_replace('*', '', trim($ban_list[$i])) . '\'';
+ $banlist[] = '\'' . trim($ban_list[$i]) . '\'';
}
}
break;