diff options
| -rw-r--r-- | phpBB/admin/admin_user_ban.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_validate.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php index eea621dbb8..1d096dea09 100644 --- a/phpBB/admin/admin_user_ban.php +++ b/phpBB/admin/admin_user_ban.php @@ -153,7 +153,7 @@ if( isset($HTTP_POST_VARS['submit']) ) // contained in the annotated php manual at php.com (ereg // 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]); } @@ -468,4 +468,4 @@ $template->pparse("body"); include('page_footer_admin.'.$phpEx); -?>
\ No newline at end of file +?> diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php index 67d585dbf4..c6f11bf87a 100644 --- a/phpBB/includes/functions_validate.php +++ b/phpBB/includes/functions_validate.php @@ -113,7 +113,7 @@ function validate_email($email) { 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) ) { return array('error' => true, 'error_msg' => $lang['Email_banned']); @@ -181,4 +181,4 @@ function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$loca return; } -?>
\ No newline at end of file +?> |