From 96624a115fe60b8ebdbbecbc2b38a7566d4e4c59 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Mon, 23 Jan 2012 17:13:37 +0100 Subject: Bug 319953: Missing real email syntax check r=glob a=LpSolit --- template/en/default/admin/params/auth.html.tmpl | 11 +++++++---- template/en/default/global/code-error.html.tmpl | 3 +-- template/en/default/global/user-error.html.tmpl | 5 ++--- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'template') diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index ceb85c984..96aba3c1d 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -93,10 +93,13 @@ "front page will require a login. No anonymous users will " _ "be permitted.", - emailregexp => "This defines the regexp to use for legal email addresses. The " _ - "default tries to match fully qualified email addresses. Another " _ - "popular value to put here is ^[^@]+$, which means " _ - "'local usernames, no @ allowed.'", + emailregexp => + "This defines the regular expression to use for legal email addresses. " _ + "The default tries to match fully qualified email addresses. " _ + "Use .* to accept any email address following the " _ + "RFC 2822 " _ + "specification. Another popular value to put here is ^[^@]+$, " _ + "which means 'local usernames, no @ allowed.'", emailregexpdesc => "This describes in English words what kinds of legal addresses " _ "are allowed by the emailregexp param.", diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 506dca582..24d0392ca 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -36,8 +36,7 @@ [% ELSE %] [%+ Param('emailregexpdesc') FILTER html_light %] [% END %] - It must also not contain any of these special characters: - \ ( ) & < > , ; : " [ ], or any whitespace. + It also must not contain any illegal characters. [% ELSIF error == "authres_unhandled" %] The result value of [% value FILTER html %] was not handled by diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 1585003ec..8dbaa4ad4 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -841,9 +841,8 @@ [% ELSE %] [%+ Param('emailregexpdesc') FILTER html_light %] [% END %] - It must also not contain any of these special characters: - \ ( ) & < > , ; : " [ ], or any whitespace. - + It also must not contain any illegal characters. + [% ELSIF error == "illegal_frequency" %] [% title = "Too Frequent" %] Unless you are an administrator, you may not create series which are -- cgit v1.2.3-24-g4f1b