diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php index c12a00153..8065b637d 100644 --- a/airtime_mvc/application/controllers/LoginController.php +++ b/airtime_mvc/application/controllers/LoginController.php @@ -58,11 +58,7 @@ class LoginController extends Zend_Controller_Action //Open the session for writing, because we close it for writing by default in Bootstrap.php as an optimization. //session_start(); - // if the post contains recaptcha field, which means form had recaptcha field. - // Hence add the element for validation. - if (array_key_exists('recaptcha_response_field', $request->getPost())) { - $form->addRecaptcha(); - } + if ($form->isValid($request->getPost())) { //get the username and password from the form $username = $form->getValue('username'); @@ -276,10 +272,6 @@ class LoginController extends Zend_Controller_Action Application_Model_LoginAttempts::increaseAttempts($_SERVER['REMOTE_ADDR']); $form = new Application_Form_Login(); $this->view->error = true; - //Only show the captcha if you get your login wrong 4 times in a row. - if (Application_Model_Subjects::getLoginAttempts($username) > 3) { - $form->addRecaptcha(); - } return $form; } } diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php index fd99e0537..d9713852a 100644 --- a/airtime_mvc/application/forms/Login.php +++ b/airtime_mvc/application/forms/Login.php @@ -71,10 +71,6 @@ class Application_Form_Login extends Zend_Form "locale" => Application_Model_Locale::getUserLocale() )); - if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) { - $this->addRecaptcha(); - } - // Add the submit button $this->addElement('submit', 'submit', array( 'ignore' => true, @@ -87,26 +83,6 @@ class Application_Form_Login extends Zend_Form } - public function addRecaptcha() - { - $pubKey = '6Ld4JsISAAAAAIxUKT4IjjOGi3DHqdoH2zk6WkYG'; - $privKey = '6Ld4JsISAAAAAJynYlXdrE4hfTReTSxYFe5szdyv'; - - $params= array('ssl' => true); - $recaptcha = new Zend_Service_ReCaptcha($pubKey, $privKey, $params); - - $captcha = new Zend_Form_Element_Captcha('captcha', - array( - 'label' => _('Type the characters you see in the picture below.'), - 'captcha' => 'ReCaptcha', - 'captchaOptions' => array( - 'captcha' => 'ReCaptcha', - 'service' => $recaptcha - ) - ) - ); - $this->addElement($captcha); - } /** * tests if a string starts with a given string