From de42338ecc0033c74477cdc06e0d0f4ec30b570e Mon Sep 17 00:00:00 2001 From: oliver Date: Sun, 19 Apr 2015 11:31:19 +0200 Subject: [PATCH] add password repeat for user registration (implements #85) --- controllers/UsersController.inc | 6 +++- locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25466 -> 25595 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 35 ++++++++++++-------- views/html/users/register.tpl | 8 +++-- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index 839a9d49..5228d3c7 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -229,6 +229,10 @@ if($this->Users->emailExists($email)) { $validation = $this->Validation->addValidationResult($validation, 'email', 'exist', true); } + $password = $this->request->getPostParam('password'); + if($password != $this->request->getPostParam('passwordrepeat')) { + $validation = $this->Validation->addValidationResult($validation, 'password', 'repeat', false); + } // Register @@ -239,7 +243,7 @@ $prename, $surname, $email, - $this->request->getPostParam('password') + $password ); $user = $this->Users->getUserById($userId); diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo index 6013d04c61d78ae74363d8ac6503d069baf86bb8..8dcc351adfcdcd96aae1faf50a742cece17e0635 100644 GIT binary patch delta 7711 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 Y7nLZKXQrm47G>n;q~>j&8vc|U0QE6f`~Uy| delta 7613 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 Y?G$0`%}ec)#5QY%-eB4+9`S@50E$Z|#sB~S diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po index d5ff0356..f6c16015 100644 --- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po +++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: The Legend of Z\n" -"POT-Creation-Date: 2015-04-15 21:08+0100\n" -"PO-Revision-Date: 2015-04-15 21:08+0100\n" +"POT-Creation-Date: 2015-04-19 11:29+0100\n" +"PO-Revision-Date: 2015-04-19 11:29+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-SearchPath-2: controllers\n" #: controllers/CharactersController.inc:402 -#: controllers/UsersController.inc:329 views/ajax/characters/index.tpl:10 +#: controllers/UsersController.inc:333 views/ajax/characters/index.tpl:10 #: views/ajax/users/index.tpl:10 views/html/characters/index.tpl:48 #: views/html/characters/manage.tpl:35 views/html/characters/manage.tpl:50 #: views/html/characters/manage.tpl:58 views/html/userroles/user.tpl:5 @@ -28,7 +28,7 @@ msgid "Admin" msgstr "Administrator" #: controllers/CharactersController.inc:408 -#: controllers/UsersController.inc:335 views/ajax/characters/index.tpl:12 +#: controllers/UsersController.inc:339 views/ajax/characters/index.tpl:12 #: views/ajax/users/index.tpl:12 views/html/characters/index.tpl:49 #: views/html/characters/manage.tpl:36 views/html/characters/manage.tpl:51 #: views/html/characters/manage.tpl:59 views/html/userroles/user.tpl:7 @@ -38,7 +38,7 @@ msgid "Moderator" msgstr "Moderator" #: controllers/CharactersController.inc:414 -#: controllers/UsersController.inc:341 views/ajax/characters/index.tpl:14 +#: controllers/UsersController.inc:345 views/ajax/characters/index.tpl:14 #: views/ajax/users/index.tpl:14 views/html/characters/index.tpl:50 #: views/html/characters/manage.tpl:37 views/html/characters/manage.tpl:53 #: views/html/characters/manage.tpl:61 views/html/userroles/user.tpl:9 @@ -1462,7 +1462,7 @@ msgstr "Login" #: views/html/users/index.tpl:15 views/html/users/index.tpl:19 #: views/html/users/index.tpl:20 views/html/users/login.tpl:12 #: views/html/users/login.tpl:13 views/html/users/manage.tpl:14 -#: views/html/users/register.tpl:85 views/html/users/register.tpl:86 +#: views/html/users/register.tpl:87 views/html/users/register.tpl:88 msgid "Username" msgstr "Benutzername" @@ -1470,8 +1470,8 @@ msgstr "Benutzername" #: views/html/introduction/index.tpl:8 views/html/users/create.tpl:92 #: views/html/users/create.tpl:93 views/html/users/edit.tpl:100 #: views/html/users/edit.tpl:101 views/html/users/login.tpl:14 -#: views/html/users/login.tpl:15 views/html/users/register.tpl:93 -#: views/html/users/register.tpl:94 +#: views/html/users/login.tpl:15 views/html/users/register.tpl:95 +#: views/html/users/register.tpl:96 views/html/users/register.tpl:98 msgid "Password" msgstr "Passwort" @@ -2069,25 +2069,25 @@ msgid "Password is too long (max. %d chars)" msgstr "Das Passwort ist zu lang (max. %d Zeichen)" #: views/html/users/create.tpl:67 views/html/users/edit.tpl:71 -#: views/html/users/register.tpl:69 +#: views/html/users/register.tpl:71 msgid "Password invalid" msgstr "Das Passwort ist ungültig" #: views/html/users/create.tpl:86 views/html/users/create.tpl:87 #: views/html/users/edit.tpl:94 views/html/users/edit.tpl:95 -#: views/html/users/register.tpl:87 views/html/users/register.tpl:88 +#: views/html/users/register.tpl:89 views/html/users/register.tpl:90 msgid "Prename" msgstr "Vorname" #: views/html/users/create.tpl:88 views/html/users/create.tpl:89 #: views/html/users/edit.tpl:96 views/html/users/edit.tpl:97 -#: views/html/users/register.tpl:89 views/html/users/register.tpl:90 +#: views/html/users/register.tpl:91 views/html/users/register.tpl:92 msgid "Surname" msgstr "Nachname" #: views/html/users/create.tpl:90 views/html/users/create.tpl:91 #: views/html/users/edit.tpl:98 views/html/users/edit.tpl:99 -#: views/html/users/register.tpl:91 views/html/users/register.tpl:92 +#: views/html/users/register.tpl:93 views/html/users/register.tpl:94 #: views/html/users/user.tpl:24 msgid "E‑mail address" msgstr "E‑Mail-Adresse" @@ -2130,7 +2130,16 @@ msgstr "Registrierung" msgid "E‑Mail address has to end with @%s" msgstr "Die E‑Mail-Adresse muss auf @%s enden" -#: views/html/users/register.tpl:96 +#: views/html/users/register.tpl:69 +#, php-format +msgid "Passwords does not match" +msgstr "Passwörter stimmen nicht überein" + +#: views/html/users/register.tpl:97 +msgid "Repeat password" +msgstr "Passwort wiederholen" + +#: views/html/users/register.tpl:100 msgid "Register" msgstr "Registrieren" diff --git a/views/html/users/register.tpl b/views/html/users/register.tpl index 78ab8b36..f4d16887 100644 --- a/views/html/users/register.tpl +++ b/views/html/users/register.tpl @@ -7,10 +7,10 @@

-
    +
      &$settings) : ?>
    • -
        +
          $value) : ?>
        • " title="" required="required" value="" />
          />
          + + />