diff options
| -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 }, |