diff options
| author | jocuri%softhome.net <> | 2004-02-26 09:07:23 +0100 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2004-02-26 09:07:23 +0100 |
| commit | e09500e15816714ae4967613dee7e436c6868e13 (patch) | |
| tree | 754b4e8f1429bdd19a9154deb57a8b6f524013ef | |
| parent | 3f5f2ce70463b56d5e85ea0982ce1ef2196f56d8 (diff) | |
| download | bugzilla-e09500e15816714ae4967613dee7e436c6868e13.tar.gz bugzilla-e09500e15816714ae4967613dee7e436c6868e13.tar.xz | |
Patch for bug 65313; improves the email regexp in order to detect better invalid email addresses; r=gerv, a=justdave.
| -rwxr-xr-x | checksetup.pl | 2 | ||||
| -rw-r--r-- | defparams.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/checksetup.pl b/checksetup.pl index 74151d87c..a6b673a60 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -3949,7 +3949,7 @@ if ($sth->rows == 0) { $mailcheckexp = Param('emailregexp'); $mailcheck = Param('emailregexpdesc'); } else { - $mailcheckexp = '^[^@]+@[^@]+\\.[^@]+$'; + $mailcheckexp = '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$'; $mailcheck = 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.'; } diff --git a/defparams.pl b/defparams.pl index e6cb16ac8..1d492de20 100644 --- a/defparams.pl +++ b/defparams.pl @@ -739,7 +739,7 @@ You will get this message once a day until you\'ve dealt with these bugs! 'popular value to put here is <tt>^[^@]+$</tt>, which means ' . '"local usernames, no @ allowed."', type => 't', - default => q:^[^@]+@[^@]+\\.[^@]+$:, + default => q:^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$:, checker => \&check_regexp }, |