Browse Source

Merge pull request #63 from hbinded/master

Password errors were not being thrown
develop
Emre Akay 10 years ago
parent
commit
a0a92dc49c
  1. 1
      application/language/english/aauth_lang.php
  2. 4
      application/libraries/Aauth.php

1
application/language/english/aauth_lang.php

@ -38,6 +38,7 @@ $lang['aauth_error_update_username_exists'] = "Username already exists on the sy
$lang['aauth_error_no_access'] = 'Sorry, you do not have access to the resource you requested.'; $lang['aauth_error_no_access'] = 'Sorry, you do not have access to the resource you requested.';
$lang['aauth_error_login_failed_email'] = 'E-mail Address and Password do not match.'; $lang['aauth_error_login_failed_email'] = 'E-mail Address and Password do not match.';
$lang['aauth_error_login_failed_name'] = 'Username and Password do not match.'; $lang['aauth_error_login_failed_name'] = 'Username and Password do not match.';
$lang['aauth_error_login_failed_all'] = 'E-mail, Username or Password do not match.';
$lang['aauth_error_login_attempts_exceeded'] = 'You have exceeded your login attempts, your account has now been locked.'; $lang['aauth_error_login_attempts_exceeded'] = 'You have exceeded your login attempts, your account has now been locked.';
$lang['aauth_error_recaptcha_not_correct'] = 'Sorry, the reCAPTCHA text entered was incorrect.'; $lang['aauth_error_recaptcha_not_correct'] = 'Sorry, the reCAPTCHA text entered was incorrect.';

4
application/libraries/Aauth.php

@ -349,7 +349,7 @@ class Aauth {
// if not matches // if not matches
else { else {
$this->error($this->CI->lang->line('aauth_error_login_failed')); $this->error($this->CI->lang->line('aauth_error_login_failed_all'));
return FALSE; return FALSE;
} }
} }
@ -2376,4 +2376,4 @@ return FALSE;
/* End of file Aauth.php */ /* End of file Aauth.php */
/* Location: ./application/libraries/Aauth.php */ /* Location: ./application/libraries/Aauth.php */

Loading…
Cancel
Save