Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Start of bugfixing for SAAS-349.

Browse source 
* Also identity verification for erry on Freenode.
This commit is contained in:
Albert Santoni 2013-09-26 15:18:41 -04:00
parent 52b7dbb226
commit 28a032388b
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/forms/EditUser.php
View file

@ -16,7 +16,8 @@ class Application_Form_EditUser extends Zend_Form
$userData = Application_Model_User::GetUserData($currentUserId); $userData = Application_Model_User::GetUserData($currentUserId);
$notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator(); $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
$emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator(); $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
$notDemoValidator = new Application_Validate_NotDemoValidate();
$this->setDecorators(array( $this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin())))); array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
$this->setAttrib('id', 'current-user-form'); $this->setAttrib('id', 'current-user-form');
@ -52,6 +53,7 @@ class Application_Form_EditUser extends Zend_Form
$passwordVerify->setRequired(true); $passwordVerify->setRequired(true);
$passwordVerify->addFilter('StringTrim'); $passwordVerify->addFilter('StringTrim');
$passwordVerify->addValidator($notEmptyValidator); $passwordVerify->addValidator($notEmptyValidator);
$passwordVerify->addValidator($notDemoValidator);
$passwordVerify->setDecorators(array('viewHelper')); $passwordVerify->setDecorators(array('viewHelper'));
$this->addElement($passwordVerify); $this->addElement($passwordVerify);

24
airtime_mvc/application/validate/NotDemoValidate.php Normal file
View file

@ -0,0 +1,24 @@
<?php
class Application_Validate_NotDemoValidate extends Zend_Validate_Abstract
{
const NOTDEMO = 'notdemo';
protected $_messageTemplates = array(
self::NOTDEMO => "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;
}
}
}