Format code using php-cs-fixer
This commit is contained in:
jo
parent
43d7dc92cd
commit
d52c6184b9
352 changed files with 17473 additions and 17041 deletions
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
class Application_Form_EditUser extends Zend_Form
|
||||
{
|
||||
|
||||
public function init()
|
||||
{
|
||||
/*
|
||||
|
|
@ -17,39 +16,39 @@ class Application_Form_EditUser extends Zend_Form
|
|||
$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->setDecorators([
|
||||
['ViewScript', ['viewScript' => 'form/edit-user.phtml', 'currentUser' => $currentUser->getLogin()]], ]);
|
||||
$this->setAttrib('id', 'current-user-form');
|
||||
|
||||
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
|
||||
$csrf_element = new Zend_Form_Element_Hidden('csrf');
|
||||
$csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
|
||||
$this->addElement($csrf_element);
|
||||
|
||||
|
||||
$hidden = new Zend_Form_Element_Hidden('cu_user_id');
|
||||
$hidden->setDecorators(array('ViewHelper'));
|
||||
$hidden->setValue($userData["id"]);
|
||||
$hidden->setDecorators(['ViewHelper']);
|
||||
$hidden->setValue($userData['id']);
|
||||
$this->addElement($hidden);
|
||||
|
||||
$login = new Zend_Form_Element_Text('cu_login');
|
||||
$login->setLabel(_('Username:'));
|
||||
$login->setValue($userData["login"]);
|
||||
$login->setValue($userData['login']);
|
||||
$login->setAttrib('class', 'input_text');
|
||||
$login->setAttrib('readonly', 'readonly');
|
||||
$login->setRequired(true);
|
||||
$login->addValidator($notEmptyValidator);
|
||||
$login->addFilter('StringTrim');
|
||||
$login->setDecorators(array('viewHelper'));
|
||||
$login->setDecorators(['viewHelper']);
|
||||
$this->addElement($login);
|
||||
|
||||
|
||||
$password = new Zend_Form_Element_Password('cu_password');
|
||||
$password->setLabel(_('Password:'));
|
||||
$password->setAttrib('class', 'input_text');
|
||||
$password->setRequired(true);
|
||||
$password->addFilter('StringTrim');
|
||||
$password->addValidator($notEmptyValidator);
|
||||
$password->setDecorators(array('viewHelper'));
|
||||
$password->setDecorators(['viewHelper']);
|
||||
$this->addElement($password);
|
||||
|
||||
$passwordVerify = new Zend_Form_Element_Password('cu_passwordVerify');
|
||||
|
|
@ -59,91 +58,94 @@ class Application_Form_EditUser extends Zend_Form
|
|||
$passwordVerify->addFilter('StringTrim');
|
||||
$passwordVerify->addValidator($notEmptyValidator);
|
||||
$passwordVerify->addValidator($notDemoValidator);
|
||||
$passwordVerify->setDecorators(array('viewHelper'));
|
||||
$passwordVerify->setDecorators(['viewHelper']);
|
||||
$this->addElement($passwordVerify);
|
||||
|
||||
$firstName = new Zend_Form_Element_Text('cu_first_name');
|
||||
$firstName->setLabel(_('Firstname:'));
|
||||
$firstName->setValue($userData["first_name"]);
|
||||
$firstName->setValue($userData['first_name']);
|
||||
$firstName->setAttrib('class', 'input_text');
|
||||
$firstName->addFilter('StringTrim');
|
||||
$firstName->setDecorators(array('viewHelper'));
|
||||
$firstName->setDecorators(['viewHelper']);
|
||||
$this->addElement($firstName);
|
||||
|
||||
$lastName = new Zend_Form_Element_Text('cu_last_name');
|
||||
$lastName->setLabel(_('Lastname:'));
|
||||
$lastName->setValue($userData["last_name"]);
|
||||
$lastName->setValue($userData['last_name']);
|
||||
$lastName->setAttrib('class', 'input_text');
|
||||
$lastName->addFilter('StringTrim');
|
||||
$lastName->setDecorators(array('viewHelper'));
|
||||
$lastName->setDecorators(['viewHelper']);
|
||||
$this->addElement($lastName);
|
||||
|
||||
$email = new Zend_Form_Element_Text('cu_email');
|
||||
$email->setLabel(_('Email:'));
|
||||
$email->setValue($userData["email"]);
|
||||
$email->setValue($userData['email']);
|
||||
$email->setAttrib('class', 'input_text');
|
||||
$email->addFilter('StringTrim');
|
||||
$email->setRequired(true);
|
||||
$email->addValidator($notEmptyValidator);
|
||||
$email->addValidator($emailValidator);
|
||||
$email->setDecorators(array('viewHelper'));
|
||||
$email->setDecorators(['viewHelper']);
|
||||
$this->addElement($email);
|
||||
|
||||
$cellPhone = new Zend_Form_Element_Text('cu_cell_phone');
|
||||
$cellPhone->setLabel(_('Mobile Phone:'));
|
||||
$cellPhone->setValue($userData["cell_phone"]);
|
||||
$cellPhone->setValue($userData['cell_phone']);
|
||||
$cellPhone->setAttrib('class', 'input_text');
|
||||
$cellPhone->addFilter('StringTrim');
|
||||
$cellPhone->setDecorators(array('viewHelper'));
|
||||
$cellPhone->setDecorators(['viewHelper']);
|
||||
$this->addElement($cellPhone);
|
||||
|
||||
$skype = new Zend_Form_Element_Text('cu_skype');
|
||||
$skype->setLabel(_('Skype:'));
|
||||
$skype->setValue($userData["skype_contact"]);
|
||||
$skype->setValue($userData['skype_contact']);
|
||||
$skype->setAttrib('class', 'input_text');
|
||||
$skype->addFilter('StringTrim');
|
||||
$skype->setDecorators(array('viewHelper'));
|
||||
$skype->setDecorators(['viewHelper']);
|
||||
$this->addElement($skype);
|
||||
|
||||
$jabber = new Zend_Form_Element_Text('cu_jabber');
|
||||
$jabber->setLabel(_('Jabber:'));
|
||||
$jabber->setValue($userData["jabber_contact"]);
|
||||
$jabber->setValue($userData['jabber_contact']);
|
||||
$jabber->setAttrib('class', 'input_text');
|
||||
$jabber->addFilter('StringTrim');
|
||||
$jabber->addValidator($emailValidator);
|
||||
$jabber->setDecorators(array('viewHelper'));
|
||||
$jabber->setDecorators(['viewHelper']);
|
||||
$this->addElement($jabber);
|
||||
|
||||
$locale = new Zend_Form_Element_Select("cu_locale");
|
||||
$locale->setLabel(_("Language:"));
|
||||
$locale = new Zend_Form_Element_Select('cu_locale');
|
||||
$locale->setLabel(_('Language:'));
|
||||
$locale->setMultiOptions(Application_Model_Locale::getLocales());
|
||||
$locale->setValue(Application_Model_Preference::GetUserLocale());
|
||||
$locale->setDecorators(array('ViewHelper'));
|
||||
$locale->setDecorators(['ViewHelper']);
|
||||
$this->addElement($locale);
|
||||
|
||||
$stationTz = Application_Model_Preference::GetDefaultTimezone();
|
||||
$userTz = Application_Model_Preference::GetUserTimezone();
|
||||
|
||||
$timezone = new Zend_Form_Element_Select("cu_timezone");
|
||||
$timezone->setLabel(_("Interface Timezone:"));
|
||||
$timezone = new Zend_Form_Element_Select('cu_timezone');
|
||||
$timezone->setLabel(_('Interface Timezone:'));
|
||||
$timezone->setMultiOptions(Application_Common_Timezone::getTimezones());
|
||||
$timezone->setValue($userTz == $stationTz ? null : $userTz);
|
||||
$timezone->setDecorators(array('ViewHelper'));
|
||||
$timezone->setDecorators(['ViewHelper']);
|
||||
$this->addElement($timezone);
|
||||
}
|
||||
|
||||
public function validateLogin($p_login, $p_userId) {
|
||||
public function validateLogin($p_login, $p_userId)
|
||||
{
|
||||
$count = CcSubjsQuery::create()
|
||||
->filterByDbLogin($p_login)
|
||||
->filterByDbId($p_userId, Criteria::NOT_EQUAL)
|
||||
->count();
|
||||
->count()
|
||||
;
|
||||
|
||||
if ($count != 0) {
|
||||
$this->getElement('cu_login')->setErrors(array(_("Login name is not unique.")));
|
||||
$this->getElement('cu_login')->setErrors([_('Login name is not unique.')]);
|
||||
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// We need to add the password identical validator here in case
|
||||
|
|
@ -152,9 +154,11 @@ class Application_Form_EditUser extends Zend_Form
|
|||
{
|
||||
if (isset($data['cu_password'])) {
|
||||
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
|
||||
$data['cu_password']);
|
||||
$data['cu_password']
|
||||
);
|
||||
$this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
|
||||
}
|
||||
|
||||
return parent::isValid($data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue