From f067b952db9d145f63ec764e917cedac1c2d6c24 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 14 Jan 2013 12:17:33 -0500
Subject: [PATCH] CC-4829: Password Verify does not work on Lucid

-code cleanup
---
 airtime_mvc/application/forms/AddUser.php  | 4 ++--
 airtime_mvc/application/forms/EditUser.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index cebc24063..75a8f659c 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -36,14 +36,12 @@ class Application_Form_AddUser extends Zend_Form
         $password->addValidator($notEmptyValidator);
         $this->addElement($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);
         $this->addElement($passwordVerify);
 
         $firstName = new Zend_Form_Element_Text('first_name');
@@ -121,6 +119,8 @@ class Application_Form_AddUser extends Zend_Form
         return true;
     }
 
+    // We need to add the password identical validator here in case
+    // Zend version is less than 1.10.5
     public function isValid($data) {
         $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
             $data['password']);
diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php
index a79d992f5..cff9dfdda 100644
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@@ -46,14 +46,12 @@ class Application_Form_EditUser extends Zend_Form
         $password->setDecorators(array('viewHelper'));
         $this->addElement($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->setDecorators(array('viewHelper'));
         $this->addElement($passwordVerify);
 
@@ -138,6 +136,8 @@ class Application_Form_EditUser extends Zend_Form
         }
     }
 
+    // We need to add the password identical validator here in case
+    // Zend version is less than 1.10.5
     public function isValid($data) {
         $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
             $data['cu_password']);