From 2322f835d1f43ad8f709d784bfcf140710ae2bae Mon Sep 17 00:00:00 2001 From: Simon Green Date: Fri, 9 Aug 2013 13:57:38 +1000 Subject: Bug 897264 - letters_numbers_specialchars password restriction is incorrect r=LpSolit, a=sgreen --- template/en/default/global/user-error.html.tmpl | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 2341cd58f..8de412413 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1334,21 +1334,21 @@ [%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long. [% ELSIF error == "password_not_complex" %] - [% title = "Password Fails Requirements" %] - [% passregex = Param('password_complexity') %] - The password must contain at least one: - + [% title = "Password Fails Requirements" %] + [% passregex = Param('password_complexity') %] + The password must contain at least one: + [% ELSIF error == "product_access_denied" %] [% title = "Product Access Denied" %] -- cgit v1.2.3-24-g4f1b From 6161e5ca40d5aeca9005a4d85e950f9ef8bdf7ec Mon Sep 17 00:00:00 2001 From: Sunil Joshi Date: Fri, 9 Aug 2013 14:02:41 +1000 Subject: Bug 868330 - Password creation directions incomplete r=sgreen, a=sgreen --- .../account/password/set-forgotten-password.html.tmpl | 15 ++++++++++++--- template/en/default/admin/params/auth.html.tmpl | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl index a2ae517c8..3bc16cbc0 100644 --- a/template/en/default/account/password/set-forgotten-password.html.tmpl +++ b/template/en/default/account/password/set-forgotten-password.html.tmpl @@ -20,10 +20,20 @@ [% title = "Change Password" %] [% PROCESS global/header.html.tmpl %] - +[% password_complexity = Param('password_complexity') %]

- To change your password, enter a new password twice: + To change your password, enter a new password twice:

+
@@ -33,7 +43,6 @@ New Password: - (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters) diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index 2e11dffbc..c757d9140 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -136,6 +136,6 @@ "
  • letters_numbers - Passwords must contain at least one UPPER and one " _ "lower case letter and a number.
    • " _ "
  • letters_numbers_specialchars - Passwords must contain at least one " _ - "UPPER or one lower case letter, a number and a special character.
    • " + "letter, a number and a special character." } %] -- cgit v1.2.3-24-g4f1b From e651ee9c34ca40afdd4582902c1656ea577a4fc3 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 10 Aug 2013 02:45:28 +0200 Subject: Back out bug 868330 for the 4.2 branch. This is not a security fix --- .../account/password/set-forgotten-password.html.tmpl | 15 +++------------ template/en/default/admin/params/auth.html.tmpl | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl index 3bc16cbc0..a2ae517c8 100644 --- a/template/en/default/account/password/set-forgotten-password.html.tmpl +++ b/template/en/default/account/password/set-forgotten-password.html.tmpl @@ -20,20 +20,10 @@ [% title = "Change Password" %] [% PROCESS global/header.html.tmpl %] -[% password_complexity = Param('password_complexity') %] +

    - To change your password, enter a new password twice:
    + To change your password, enter a new password twice:

    -
      -
    • Password must be at least [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long.
      • - [% IF password_complexity == "mixed_letters" %] -
    • Password must contain at least one UPPER and one lowercase letter.
      • - [% ELSIF password_complexity == "letters_numbers" %] -
    • Password must contain at least one UPPER and one lower case letter and a number.
      • - [% ELSIF password_complexity == "letters_numbers_specialchars" %] -
    • Password must contain at least one letter, a number and a special character.
      • - [% END %] -
    @@ -43,6 +33,7 @@ New Password: + (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters) diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index c757d9140..2e11dffbc 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -136,6 +136,6 @@ "
  • letters_numbers - Passwords must contain at least one UPPER and one " _ "lower case letter and a number.
    • " _ "
  • letters_numbers_specialchars - Passwords must contain at least one " _ - "letter, a number and a special character.
    • " + "UPPER or one lower case letter, a number and a special character." } %] -- cgit v1.2.3-24-g4f1b