makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

a "fix" for #529920... Now banned emails can appear in *user*@domain.com

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2325 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
the_systech 2002-03-18 19:42:05 +00:00
parent 506be5f874
commit 315f0e4d3a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/admin/admin_user_ban.php
View file

@ -153,7 +153,7 @@ if( isset($HTTP_POST_VARS['submit']) )
// contained in the annotated php manual at php.com (ereg // contained in the annotated php manual at php.com (ereg
// section) // section)
// //
if( eregi("^(([[:alnum:]]+([-_.][[:alnum:]]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", 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]); $email_list[] = trim($email_list_temp[$i]);
} }
@ -468,4 +468,4 @@ $template->pparse("body");
include('page_footer_admin.'.$phpEx); include('page_footer_admin.'.$phpEx);
?> ?>

4
phpBB/includes/functions_validate.php
View file

@ -113,7 +113,7 @@ function validate_email($email)
{ {
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
{ {
$match_email = str_replace('*@', '.*@', $row['ban_email']); $match_email = str_replace('*', '.*', $row['ban_email']);
if ( preg_match('/^' . $match_email . '$/is', $email) ) if ( preg_match('/^' . $match_email . '$/is', $email) )
{ {
return array('error' => true, 'error_msg' => $lang['Email_banned']); return array('error' => true, 'error_msg' => $lang['Email_banned']);
@ -181,4 +181,4 @@ function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$loca
return; return;
} }
?> ?>