From 729e221d58c1e0dafb027ddef399c9f5a210b1d0 Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Tue, 8 Mar 2011 16:06:38 +0000 Subject: Bug 622513 - Email-related regexp checking should be case-insensitive. a=mkanat. --- Bugzilla/WebService/User.pm | 2 +- createaccount.cgi | 2 +- template/en/default/admin/params/auth.html.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm index 9f118d4a6..b9434059d 100644 --- a/Bugzilla/WebService/User.pm +++ b/Bugzilla/WebService/User.pm @@ -95,7 +95,7 @@ sub offer_account_by_email { if (!$createexp) { ThrowUserError("account_creation_disabled"); } - elsif ($email !~ /$createexp/) { + elsif ($email !~ /$createexp/i) { ThrowUserError("account_creation_restricted"); } diff --git a/createaccount.cgi b/createaccount.cgi index c2941bc4c..db0727add 100755 --- a/createaccount.cgi +++ b/createaccount.cgi @@ -65,7 +65,7 @@ if (defined($login)) { $login = Bugzilla::User->check_login_name_for_creation($login); $vars->{'login'} = $login; - if ($login !~ /$createexp/) { + if ($login !~ /$createexp/i) { ThrowUserError("account_creation_restricted"); } diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index 8e91e54c0..2e11dffbc 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -120,7 +120,7 @@ "the emailregexp param to only allow local usernames, " _ "but you want the mail to be delivered to username@my.local.hostname.", - createemailregexp => "This defines the regexp to use for email addresses that are " _ + createemailregexp => "This defines the (case-insensitive) regexp to use for email addresses that are " _ "permitted to self-register using a 'New Account' feature. The " _ "default (.*) permits any account matching the emailregexp " _ "to be created. If this parameter is left blank, no users " _ -- cgit v1.2.3-24-g4f1b