From 28a032388bfe8205e3273ee8fad71a7094e64eaf Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 26 Sep 2013 15:18:41 -0400 Subject: [PATCH] Start of bugfixing for SAAS-349. * Also identity verification for erry on Freenode. --- airtime_mvc/application/forms/EditUser.php | 4 +++- .../application/validate/NotDemoValidate.php | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 airtime_mvc/application/validate/NotDemoValidate.php diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php index cff9dfdda..853e8c479 100644 --- a/airtime_mvc/application/forms/EditUser.php +++ b/airtime_mvc/application/forms/EditUser.php @@ -16,7 +16,8 @@ class Application_Form_EditUser extends Zend_Form $userData = Application_Model_User::GetUserData($currentUserId); $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator(); $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator(); - + $notDemoValidator = new Application_Validate_NotDemoValidate(); + $this->setDecorators(array( array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin())))); $this->setAttrib('id', 'current-user-form'); @@ -52,6 +53,7 @@ class Application_Form_EditUser extends Zend_Form $passwordVerify->setRequired(true); $passwordVerify->addFilter('StringTrim'); $passwordVerify->addValidator($notEmptyValidator); + $passwordVerify->addValidator($notDemoValidator); $passwordVerify->setDecorators(array('viewHelper')); $this->addElement($passwordVerify); diff --git a/airtime_mvc/application/validate/NotDemoValidate.php b/airtime_mvc/application/validate/NotDemoValidate.php new file mode 100644 index 000000000..2d9cc0953 --- /dev/null +++ b/airtime_mvc/application/validate/NotDemoValidate.php @@ -0,0 +1,24 @@ + "Cannot be changed in demo mode" + ); + + public function isValid($value) + { + $this->_setValue($value); + + $CC_CONFIG = Config::getConfig(); + if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1) { + $this->_error(self::NOTDEMO); + return false; + } else { + return false; + } + } +} +