Merge pull request benedmunds#480 from thomasruns/2

Update 2 issues with forgot password process

Author: benedmunds

controllers/auth.php

@@ -211,6 +211,12 @@ function forgot_password()
 			$config_tables = $this->config->item('tables', 'ion_auth');
 			$identity = $this->db->where('email', $this->input->post('email'))->limit('1')->get($config_tables['users'])->row();
 
+            if(empty($identity)) {
+                $this->ion_auth->set_message('forgot_password_email_not_found');
+                $this->session->set_flashdata('message', $this->ion_auth->messages());
+                redirect("auth/forgot_password", 'refresh');
+            }
+            
 			//run the forgotten password method to email an activation code to the user
 			$forgotten = $this->ion_auth->forgotten_password($identity->{$this->config->item('identity', 'ion_auth')});
 

language/arabic/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/bulgarian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/catalan/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/croatian/auth_lang.php

@@ -138,7 +138,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email';
 $lang['forgot_password_username_identity_label'] = 'Korisničko ime';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Promjena lozinke';

language/czech/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/danish/auth_lang.php

@@ -144,7 +144,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email-adresse';
 $lang['forgot_password_username_identity_label'] = 'Brugernavn';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Skift Kodeord';

language/dutch/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/english/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/english/ion_auth_lang.php

@@ -58,4 +58,4 @@
 // Email Subjects
 $lang['email_forgotten_password_subject']    = 'Forgotten Password Verification';
 $lang['email_new_password_subject']          = 'New Password';
-$lang['email_activation_subject']            = 'Account Activation';
+$lang['email_activation_subject']            = 'Account Activation';

language/estonian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/finnish/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/french/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/german/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/greek/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/indonesian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/italian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/japanese/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'メールアドレス';
 $lang['forgot_password_username_identity_label'] = 'ユーザー名';
 $lang['forgot_password_email_identity_label']    = 'メールアドレス';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'パスワードの変更';

language/korean/auth_lang.php

@@ -132,7 +132,7 @@
 $lang['forgot_password_validation_email_label']  = '이메일 주소';
 $lang['forgot_password_username_identity_label'] = '계정명';
 $lang['forgot_password_email_identity_label']    = '이메일';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = '비밀번호 바꾸기';

language/lithuanian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/norwegian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/persian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/pirate/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/polish/auth_lang.php

@@ -94,10 +94,11 @@
 $lang['change_password_submit_btn']                 = 'Change';
 
 // Forgot Password
-$lang['forgot_password_heading']     = 'Forgot Password';
-$lang['forgot_password_subheading']  = 'Please enter your %s so we can send you an email to reset your password.';
-$lang['forgot_password_email_label'] = '%s:';
-$lang['forgot_password_submit_btn']  = 'Submit';
+$lang['forgot_password_heading']                 = 'Forgot Password';
+$lang['forgot_password_subheading']              = 'Please enter your %s so we can send you an email to reset your password.';
+$lang['forgot_password_email_label']             = '%s:';
+$lang['forgot_password_submit_btn']              = 'Submit';
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                    = 'Change Password';

language/portuguese/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/romanian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/russian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/slovak/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/slovenian/auth_lang.php

@@ -133,7 +133,7 @@
 $lang['forgot_password_validation_email_label']  = 'Elektronski naslov';
 $lang['forgot_password_username_identity_label'] = 'Uporabniško ime';
 $lang['forgot_password_email_identity_label']    = 'E-naslov';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Ponastavi geslo
 $lang['reset_password_heading']                               = 'Spremeni geslo';

language/spanish/auth_lang.php

@@ -138,7 +138,7 @@
 $lang['forgot_password_validation_email_label']  = 'Correo Electronico';
 $lang['forgot_password_username_identity_label'] = 'Usuario';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Cambiar Contraseña';

language/swedish/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/turkish/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/ukrainian/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/zh_cn/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

language/zh_tw/auth_lang.php

@@ -135,7 +135,7 @@
 $lang['forgot_password_validation_email_label']  = 'Email Address';
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
-
+$lang['forgot_password_email_not_found']         = 'No record of that email address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Change Password';

libraries/Ion_auth.php

@@ -140,7 +140,7 @@ public function forgotten_password($identity)    //changed $email to $identity
 		if ( $this->ion_auth_model->forgotten_password($identity) )   //changed
 		{
 			// Get user information
-			$user = $this->where($this->config->item('identity', 'ion_auth'), $identity)->users()->row();  //changed to get_user_by_identity from email
+            $user = $this->where($this->config->item('identity', 'ion_auth'), $identity)->where('active', 1)->users()->row();  //changed to get_user_by_identity from email
 
 			if ($user)
 			{