Fixed missing password.token string and checked for user existing before trying to reset

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -73,6 +73,7 @@ class ResetPasswordController extends Controller
 
     public function reset(Request $request)
     {
+
         $messages = [
             'password.not_in' => trans('validation.disallow_same_pwd_as_user_fields'),
         ];
@@ -80,9 +81,9 @@ class ResetPasswordController extends Controller
         $request->validate($this->rules(), $request->all(), $this->validationErrorMessages());
 
         // Check to see if the user even exists
-        $user = User::where('username', '=', $request->input('username'))->first();
+        if ($user = User::where('username', '=', $request->input('username'))->first()) {
-
             $broker = $this->broker();
+
             if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) {
                 $request->validate(
                     [
@@ -101,6 +102,15 @@ class ResetPasswordController extends Controller
                     : $this->sendResetFailedResponse($request, $response);
         }
 
+        // the user doesn't exist, so we're not really sending anything here
+        return redirect()->route('login')
+            ->withInput(['username'=> $request->input('username')])
+            ->with('success', trans('passwords.sent'));
+
+    }
+
+
+
     protected function sendResetFailedResponse(Request $request, $response)
     {
         return redirect()->back()

resources/lang/en/passwords.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
-    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
+    'sent'	        => 'If that email address exists in our system, a password recovery email has been sent.',
     'user'			=> 'No matching active user found with that email.',
+    "token"         => "This password reset token is invalid or expired.",
 ];

resources/lang/en/reminders.php

@@ -17,7 +17,7 @@ return array(
 
     "user"     => "Username or email address is incorrect",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    =>  "This password reset token is invalid or expired.",
 
     "sent" => "If a matching email address was found, a password reminder has been sent!",