mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 07:07:51 +02:00
Wildcard username ban in email banning
git-svn-id: file:///svn/phpbb/trunk@791 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
1001c86651
commit
1d2382ccc0
@ -173,7 +173,7 @@ if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['bancontrol']) )
|
||||
// contained in the annotated php manual at php.com (ereg
|
||||
// section)
|
||||
//
|
||||
if( eregi("^[[:alnum:]]([-_.]?[[:alnum:]]\.?)*@[[:alnum:]]([-_.]?[[:alnum:]]\.?)*\.[[:alnum:]]{0,4}$", trim( $email_list_temp[$i])) )
|
||||
if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
|
||||
{
|
||||
$email_list[] = trim($email_list_temp[$i]);
|
||||
}
|
||||
|
@ -740,9 +740,9 @@ $lang['Ban_username'] = "Ban one or more specific users";
|
||||
$lang['Ban_username_explain'] = "You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";
|
||||
$lang['Ban_IP'] = "Ban one or more IP addresses or hostnames";
|
||||
$lang['IP_hostname'] = "IP addresses or hostnames";
|
||||
$lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas, to specify a range of IP's (not hostnames) separate the start and end with a hyphen (-), to specify a wildcard use *";
|
||||
$lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *";
|
||||
$lang['Ban_email'] = "Ban one or more email addresses";
|
||||
$lang['Ban_email_explain'] = "To specify more than one email address separate them with commas";
|
||||
$lang['Ban_email_explain'] = "To specify more than one email address separate them with commas. To specify a wildcard username use *, for example *@hotmail.com";
|
||||
|
||||
$lang['Unban_username'] = "Un-ban one more specific users";
|
||||
$lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";
|
||||
|
@ -330,7 +330,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
|
||||
$ban_email_list = $db->sql_fetchrowset($result);
|
||||
for($i = 0; $i < count($ban_email_list); $i++)
|
||||
{
|
||||
if( eregi("^" . $ban_email_list[$i]['ban_email'] . "$", $email) )
|
||||
$match_email = str_replace("*@", ".*@", $ban_email_list[$i]['ban_email']);
|
||||
if( eregi("^" . $match_email . "$", $email) )
|
||||
{
|
||||
$error = TRUE;
|
||||
if(isset($error_msg))
|
||||
|
Loading…
x
Reference in New Issue
Block a user