summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Warg <mw@it-sls.de>2010-04-22 11:43:06 +0200
committerMarkus Warg <mw@it-sls.de>2010-04-22 11:43:06 +0200
commitf3f8547446e0a14dd53c972de53b9afaf950814c (patch)
tree426846487684d39a9763054bcc4f62741c4d81a5
parent80ef52e1a22bf509b684eaa716e9d3b3e99ce180 (diff)
parentb6598b4f74bf1236b24764a16e321c3dbf7d5c69 (diff)
downloadcacert-mgr-f3f8547446e0a14dd53c972de53b9afaf950814c.tar.gz
cacert-mgr-f3f8547446e0a14dd53c972de53b9afaf950814c.tar.xz
cacert-mgr-f3f8547446e0a14dd53c972de53b9afaf950814c.zip
Merge branch 'master' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-mgr
-rw-r--r--manager/application/controllers/LoginController.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/manager/application/controllers/LoginController.php b/manager/application/controllers/LoginController.php
index c89da5c..08a9519 100644
--- a/manager/application/controllers/LoginController.php
+++ b/manager/application/controllers/LoginController.php
@@ -218,14 +218,14 @@ class LoginController extends Zend_Controller_Action
$al->setDefaultTranslator(I18n::getTranslate());
$al->setDisableTranslator(false);
$username = new Zend_Form_Element_Text('login_name');
- $username->addValidator(new Zend_Validate_StringLength(2,20))
- ->setRequired(true)
- ->addFilter('StringToLower')
- ->setLabel(I18n::_('User Name'));
+ $username->setRequired(true)
+ ->setLabel(I18n::_('User Name'))
+ ->addFilter(new Zend_Filter_StringTrim())
+ ->addFilter(new Zend_Filter_StripTags());
$password = new Zend_Form_Element_Password('login_password');
- $password->addValidator(new Zend_Validate_StringLength(8,20))
- ->setRequired(true)
- ->setLabel(I18n::_('Password'));
+ $password->setRequired(true)
+ ->setLabel(I18n::_('Password'))
+ ->addFilter(new Zend_Filter_StringTrim());
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Login'));
$form->addElement($username)