From 2fd822f6b33413e8fa34a6f935be2caca08c0466 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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 delta 7613 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 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="" />
          />
          + + />