coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

add password repeat for user registration (implements #85)

Browse source
This commit is contained in:
oliver 2015-04-19 11:31:19 +02:00
commit 2fd822f6b3
4 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
controllers/UsersController.inc
View file

@ -229,6 +229,10 @@
if($this->Users->emailExists($email)) { if($this->Users->emailExists($email)) {
$validation = $this->Validation->addValidationResult($validation, 'email', 'exist', true); $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 // Register
@ -239,7 +243,7 @@
$prename, $prename,
$surname, $surname,
$email, $email,
$this->request->getPostParam('password') $password
); );
$user = $this->Users->getUserById($userId); $user = $this->Users->getUserById($userId);

BIN
locale/de_DE/LC_MESSAGES/The Legend of Z.mo
View file

Binary file not shown.

35
locale/de_DE/LC_MESSAGES/The Legend of Z.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Legend of Z\n" "Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2015-04-15 21:08+0100\n" "POT-Creation-Date: 2015-04-19 11:29+0100\n"
"PO-Revision-Date: 2015-04-15 21:08+0100\n" "PO-Revision-Date: 2015-04-19 11:29+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -18,7 +18,7 @@ msgstr ""
"X-Poedit-SearchPath-2: controllers\n" "X-Poedit-SearchPath-2: controllers\n"
#: controllers/CharactersController.inc:402 #: 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/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:35 views/html/characters/manage.tpl:50
#: views/html/characters/manage.tpl:58 views/html/userroles/user.tpl:5 #: views/html/characters/manage.tpl:58 views/html/userroles/user.tpl:5
@ -28,7 +28,7 @@ msgid "Admin"
msgstr "Administrator" msgstr "Administrator"
#: controllers/CharactersController.inc:408 #: 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/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:36 views/html/characters/manage.tpl:51
#: views/html/characters/manage.tpl:59 views/html/userroles/user.tpl:7 #: views/html/characters/manage.tpl:59 views/html/userroles/user.tpl:7
@ -38,7 +38,7 @@ msgid "Moderator"
msgstr "Moderator" msgstr "Moderator"
#: controllers/CharactersController.inc:414 #: 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/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:37 views/html/characters/manage.tpl:53
#: views/html/characters/manage.tpl:61 views/html/userroles/user.tpl:9 #: 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:15 views/html/users/index.tpl:19
#: views/html/users/index.tpl:20 views/html/users/login.tpl:12 #: 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/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" msgid "Username"
msgstr "Benutzername" msgstr "Benutzername"
@ -1470,8 +1470,8 @@ msgstr "Benutzername"
#: views/html/introduction/index.tpl:8 views/html/users/create.tpl:92 #: 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/create.tpl:93 views/html/users/edit.tpl:100
#: views/html/users/edit.tpl:101 views/html/users/login.tpl:14 #: 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/login.tpl:15 views/html/users/register.tpl:95
#: views/html/users/register.tpl:94 #: views/html/users/register.tpl:96 views/html/users/register.tpl:98
msgid "Password" msgid "Password"
msgstr "Passwort" msgstr "Passwort"
@ -2069,25 +2069,25 @@ msgid "Password is too long (max. %d chars)"
msgstr "Das Passwort ist zu lang (max. %d Zeichen)" msgstr "Das Passwort ist zu lang (max. %d Zeichen)"
#: views/html/users/create.tpl:67 views/html/users/edit.tpl:71 #: 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" msgid "Password invalid"
msgstr "Das Passwort ist ungültig" msgstr "Das Passwort ist ungültig"
#: views/html/users/create.tpl:86 views/html/users/create.tpl:87 #: 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/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" msgid "Prename"
msgstr "Vorname" msgstr "Vorname"
#: views/html/users/create.tpl:88 views/html/users/create.tpl:89 #: 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/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" msgid "Surname"
msgstr "Nachname" msgstr "Nachname"
#: views/html/users/create.tpl:90 views/html/users/create.tpl:91 #: 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/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 #: views/html/users/user.tpl:24
msgid "E‑mail address" msgid "E‑mail address"
msgstr "E‑Mail-Adresse" msgstr "E‑Mail-Adresse"
@ -2130,7 +2130,16 @@ msgstr "Registrierung"
msgid "E‑Mail address has to end with @%s" msgid "E‑Mail address has to end with @%s"
msgstr "Die E‑Mail-Adresse muss auf @%s enden" 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" msgid "Register"
msgstr "Registrieren" msgstr "Registrieren"

8
views/html/users/register.tpl
View file

@ -7,10 +7,10 @@
<h1><?=_('Registration')?></h1> <h1><?=_('Registration')?></h1>
<?php if($validation !== true) : ?> <?php if($validation !== true) : ?>
<ul> <ul class="validation">
<?php foreach($validation as $field => &$settings) : ?> <?php foreach($validation as $field => &$settings) : ?>
<li> <li>
<ul> <ul class="subvalidation">
<?php foreach($settings as $setting => $value) : ?> <?php foreach($settings as $setting => $value) : ?>
<li> <li>
<?php switch($field) { <?php switch($field) {
@ -66,6 +66,8 @@
break; break;
case 'maxlength': printf(_('Password is too long (max. %d chars)'), $value); case 'maxlength': printf(_('Password is too long (max. %d chars)'), $value);
break; break;
case 'repeat': printf(_('Passwords does not match'));
break;
default: echo _('Password invalid'); default: echo _('Password invalid');
} }
break; break;
@ -92,6 +94,8 @@
<input name="email" type="email" placeholder="<?=(!empty($emailhost)) ? '…@'.$emailhost : _('E‑mail address')?>" title="<?=_('E‑mail address')?>" required="required" value="<?=$email?>" <?=(array_key_exists('email', $validation)) ? 'class="invalid"' : null?> /><br /> <input name="email" type="email" placeholder="<?=(!empty($emailhost)) ? '…@'.$emailhost : _('E‑mail address')?>" title="<?=_('E‑mail address')?>" required="required" value="<?=$email?>" <?=(array_key_exists('email', $validation)) ? 'class="invalid"' : null?> /><br />
<label for="password"><?=_('Password')?>:</label> <label for="password"><?=_('Password')?>:</label>
<input name="password" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" maxlength="<?=$validationSettings['password']['maxlength']?>" <?=(array_key_exists('password', $validation)) ? 'class="invalid"' : null?> /><br /> <input name="password" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" maxlength="<?=$validationSettings['password']['maxlength']?>" <?=(array_key_exists('password', $validation)) ? 'class="invalid"' : null?> /><br />
<label for="passwordrepeat"><?=_('Repeat password')?>:</label>
<input name="passwordrepeat" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" maxlength="<?=$validationSettings['password']['maxlength']?>" <?=(array_key_exists('password', $validation)) ? 'class="invalid"' : null?> /><br />
</fieldset> </fieldset>
<input type="submit" name="register" value="<?=_('Register')?>" /> <input type="submit" name="register" value="<?=_('Register')?>" />
</form> </form>