From 90a66b61d38b2ae1a9c7a6c20478b901d1994bff Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 18 Apr 2011 11:01:58 -0400 Subject: [PATCH] correct password form fields --- plugins/EmailRegistration/emailregister.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/EmailRegistration/emailregister.php b/plugins/EmailRegistration/emailregister.php index 8113111a6c..9da6196ee5 100644 --- a/plugins/EmailRegistration/emailregister.php +++ b/plugins/EmailRegistration/emailregister.php @@ -275,6 +275,16 @@ class EmailregisterAction extends Action if (!$this->tos) { $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); $this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code); $this->showPage(); @@ -285,6 +295,7 @@ class EmailregisterAction extends Action $this->user = User::register(array('nickname' => $nickname, 'email' => $email, + 'password' => $this->password1, 'email_confirmed' => true)); if (empty($this->user)) { -- 2.39.5