Patch for bug 65313; improves the email regexp in order to detect better invalid...

diff --git a/checksetup.pl b/checksetup.pl
index 74151d87cd61f4e4a85c6df6ef147a8c5d830fde..a6b673a6088e139f643cec481cc8c460e76adcb3 100755 (executable)
--- 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 e6cb16ac87af49b774a6880b2efe6614c6578b22..1d492de20b5806ec629877da210bd97f7d9e9396 100644 (file)
--- 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
   },