From 83a450565ecfef119a6e04521a738cbb8dd0f8e8 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 14 Jan 2013 12:07:17 -0500 Subject: [PATCH] CC-4829: Password Verify does not work on Lucid -fixed --- airtime_mvc/application/forms/AddUser.php | 11 +++++++++-- airtime_mvc/application/forms/EditUser.php | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php index ac7609f7a..cebc24063 100644 --- a/airtime_mvc/application/forms/AddUser.php +++ b/airtime_mvc/application/forms/AddUser.php @@ -36,14 +36,14 @@ class Application_Form_AddUser extends Zend_Form $password->addValidator($notEmptyValidator); $this->addElement($password); - $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('password'); + //$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('password'); $passwordVerify = new Zend_Form_Element_Password('passwordVerify'); $passwordVerify->setLabel(_('Verify Password:')); $passwordVerify->setAttrib('class', 'input_text'); $passwordVerify->setRequired(true); $passwordVerify->addFilter('StringTrim'); $passwordVerify->addValidator($notEmptyValidator); - $passwordVerify->addValidator($passwordIdenticalValidator); + //$passwordVerify->addValidator($passwordIdenticalValidator); $this->addElement($passwordVerify); $firstName = new Zend_Form_Element_Text('first_name'); @@ -120,4 +120,11 @@ class Application_Form_AddUser extends Zend_Form return true; } + + public function isValid($data) { + $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator( + $data['password']); + $this->getElement('passwordVerify')->addValidator($passwordIdenticalValidator); + return parent::isValid($data); + } } diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php index dea7f1f6c..a79d992f5 100644 --- a/airtime_mvc/application/forms/EditUser.php +++ b/airtime_mvc/application/forms/EditUser.php @@ -46,14 +46,14 @@ class Application_Form_EditUser extends Zend_Form $password->setDecorators(array('viewHelper')); $this->addElement($password); - $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('cu_password'); + //$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('cu_password'); $passwordVerify = new Zend_Form_Element_Password('cu_passwordVerify'); $passwordVerify->setLabel(_('Verify Password:')); $passwordVerify->setAttrib('class', 'input_text'); $passwordVerify->setRequired(true); $passwordVerify->addFilter('StringTrim'); $passwordVerify->addValidator($notEmptyValidator); - $passwordVerify->addValidator($passwordIdenticalValidator); + //$passwordVerify->addValidator($passwordIdenticalValidator); $passwordVerify->setDecorators(array('viewHelper')); $this->addElement($passwordVerify); @@ -137,4 +137,11 @@ class Application_Form_EditUser extends Zend_Form return true; } } + + public function isValid($data) { + $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator( + $data['cu_password']); + $this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator); + return parent::isValid($data); + } }