GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

correct password form fields

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-18 11:01:58 -04:00
parent fc89006e56
commit 90a66b61d3
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/EmailRegistration/emailregister.php
View File

@ -275,6 +275,16 @@ class EmailregisterAction extends Action
if (!$this->tos) { if (!$this->tos) {
$this->error = _('You must accept the terms of service and privacy policy to register.'); $this->error = _('You must accept the terms of service and privacy policy to register.');
return;
} else if (empty($this->password1)) {
$this->error = _('You must set a password');
} else if (strlen($this->password1) < 6) {
$this->error = _('Password must be 6 or more characters.');
} else if ($this->password1 != $this->password2) {
$this->error = _('Passwords do not match.');
}
if (!empty($this->error)) {
$nickname = $this->nicknameFromEmail($email); $nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code); $this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage(); $this->showPage();
@ -285,6 +295,7 @@ class EmailregisterAction extends Action
$this->user = User::register(array('nickname' => $nickname, $this->user = User::register(array('nickname' => $nickname,
'email' => $email, 'email' => $email,
'password' => $this->password1,
'email_confirmed' => true)); 'email_confirmed' => true));
if (empty($this->user)) { if (empty($this->user)) {