fixed comment/echo and wrapped date updater in a check

Author: M4ttoF

app/app/Http/Controllers/PasswordRecoveryController.php

@@ -21,9 +21,8 @@ public function form(Request $request)
     public function sendEmail(Request $request)
     {
         $validation_rules = array(
-            'email'                 => 'required|email'
-            //UNDO THIS LATER
-            //,'g-recaptcha-response'  => 'required|captcha'
+            'email'                 => 'required|email',
+            'g-recaptcha-response'  => 'required|captcha'
         );
         $validator = Validator::make(Input::all(), $validation_rules);
         if ($validator->fails()) {
@@ -39,7 +38,6 @@ public function sendEmail(Request $request)
 
         //Generate Password Recovery Link
         $token = str_random(60);
-        echo $token;
         $recoveryLink = config('app.url')."/user/password-recovery/".$matching_user->email."/".$token;
         $matching_user->password_recovery_token = $token;
         $matching_user->save();
@@ -85,7 +83,9 @@ public function resetPassword(Request $request)
                 return Redirect::back()->withErrors($validator)->withInput();
             } else {
                 $user->password_hash = User::generateSaltedHash($request->input('new_password'));
-                $user->email_verification_time = date('Y-m-d H:i:s');
+                if ($user->email_verification_time == null){
+                    $user->email_verification_time = date('Y-m-d H:i:s');    
+                }
                 $user->save();
                 return Redirect::to('/signin?message=Password+Updated!');
             }