From 5b0bba72b1c619af2f39859ec0c262f860f991ac Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sat, 20 Apr 2002 00:22:29 +0000 Subject: merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_validate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/includes/functions_validate.php') diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php index 4d61a44458..22b4c1c185 100644 --- a/phpBB/includes/functions_validate.php +++ b/phpBB/includes/functions_validate.php @@ -63,7 +63,7 @@ function validate_username($username) { while( $row = $db->sql_fetchrow($result) ) { - if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) ) + if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) ) { return array('error' => true, 'error_msg' => $lang['Username_disallowed']); } @@ -76,7 +76,7 @@ function validate_username($username) { while( $row = $db->sql_fetchrow($result) ) { - if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['word'])) . ")\b#i", $username) ) + if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'])) . ")\b#i", $username) ) { return array('error' => true, 'error_msg' => $lang['Username_disallowed']); } @@ -102,7 +102,7 @@ function validate_email($email) if ( $email != '' ) { - if ( preg_match('/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) ) + if ( preg_match('/^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) ) { $sql = "SELECT ban_email FROM " . BANLIST_TABLE; @@ -110,7 +110,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']); -- cgit v1.2.1