Merged 2.5.x into saas
This commit is contained in:
commit
4d263ce897
26 changed files with 2618 additions and 1649 deletions
|
@ -53,13 +53,11 @@ class Application_Form_Login extends Zend_Form
|
|||
$locale->setMultiOptions(Application_Model_Locale::getLocales());
|
||||
$locale->setDecorators(array('ViewHelper'));
|
||||
$this->addElement($locale);
|
||||
$this->setDefaults(array(
|
||||
"locale" => Application_Model_Locale::getUserLocale()
|
||||
));
|
||||
|
||||
$recaptchaNeeded = false;
|
||||
if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) {
|
||||
$recaptchaNeeded = true;
|
||||
}
|
||||
if ($recaptchaNeeded) {
|
||||
// recaptcha
|
||||
$this->addRecaptcha();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue