diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php index 75a8f659c..1d3835ae7 100644 --- a/airtime_mvc/application/forms/AddUser.php +++ b/airtime_mvc/application/forms/AddUser.php @@ -1,4 +1,5 @@ setAttrib('id', 'user_form'); $hidden = new Zend_Form_Element_Hidden('user_id'); @@ -42,6 +44,7 @@ class Application_Form_AddUser extends Zend_Form $passwordVerify->setRequired(true); $passwordVerify->addFilter('StringTrim'); $passwordVerify->addValidator($notEmptyValidator); + $passwordVerify->addValidator($notDemoValidator); $this->addElement($passwordVerify); $firstName = new Zend_Form_Element_Text('first_name'); diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php index 853e8c479..2711bb334 100644 --- a/airtime_mvc/application/forms/EditUser.php +++ b/airtime_mvc/application/forms/EditUser.php @@ -1,4 +1,5 @@ _setValue($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; + return true; } } } diff --git a/freenode.txt b/freenode.txt deleted file mode 100644 index 05924a820..000000000 --- a/freenode.txt +++ /dev/null @@ -1 +0,0 @@ -e7Y4a8H6