From eacf9b153900dbfabe74c16c343cd27756b7c551 Mon Sep 17 00:00:00 2001 From: hbinded Date: Mon, 28 Sep 2015 20:48:17 +0200 Subject: [PATCH 1/2] Fix wrong password message This fixes a non existing error message if all authentication methods fail. Line 352 is calling
aauth_error_login_failed
but that is not in the lang line. This fix tries to match the naming used by the OP i.e. aauth_error_login_failed_xxx where xxx is the error (email/password). --- application/libraries/Aauth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php index 0964335..3c50650 100644 --- a/application/libraries/Aauth.php +++ b/application/libraries/Aauth.php @@ -349,7 +349,7 @@ class Aauth { // if not matches else { - $this->error($this->CI->lang->line('aauth_error_login_failed')); + $this->error($this->CI->lang->line('aauth_error_login_failed_all')); return FALSE; } } @@ -2391,4 +2391,4 @@ return FALSE; /* End of file Aauth.php */ -/* Location: ./application/libraries/Aauth.php */ \ No newline at end of file +/* Location: ./application/libraries/Aauth.php */ From 4be259129d55e6bfe7a361a0b190a0188aba2326 Mon Sep 17 00:00:00 2001 From: hbinded Date: Mon, 28 Sep 2015 20:50:12 +0200 Subject: [PATCH 2/2] Added wrong password message This adds a 'aauth_error_login_failed_all which is referenced in the Aauth.php --- application/language/english/aauth_lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/language/english/aauth_lang.php b/application/language/english/aauth_lang.php index c6b7bbb..437a69d 100644 --- a/application/language/english/aauth_lang.php +++ b/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_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_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_recaptcha_not_correct'] = 'Sorry, the reCAPTCHA text entered was incorrect.';