Refactored search runner a little to be neater

[bookstack] / app / Http / Controllers / Auth / ResetPasswordController.php

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index efdf0015924f6d831a0233a737e7209ff246b7e0..a31529b119b502b2fbddc0d3779b147e628ba043 100644 (file)
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use BookStack\Actions\ActivityType;

 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;


@@ -33,20 +34,22 @@ class ResetPasswordController extends Controller
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');

-        parent::__construct();

     }
 
     /**
      * Get the response for a successful password reset.
      *
      * @param Request $request
     }
 
     /**
      * Get the response for a successful password reset.
      *
      * @param Request $request

-     * @param string $response
+     * @param string  $response
+     *

      * @return \Illuminate\Http\Response
      */
     protected function sendResetResponse(Request $request, $response)
     {
         $message = trans('auth.reset_password_success');
         $this->showSuccessNotification($message);
      * @return \Illuminate\Http\Response
      */
     protected function sendResetResponse(Request $request, $response)
     {
         $message = trans('auth.reset_password_success');
         $this->showSuccessNotification($message);

+        $this->logActivity(ActivityType::AUTH_PASSWORD_RESET_UPDATE, user());
+

         return redirect($this->redirectPath())
             ->with('status', trans($response));
     }
         return redirect($this->redirectPath())
             ->with('status', trans($response));
     }


@@ -54,8 +57,9 @@ class ResetPasswordController extends Controller
     /**
      * Get the response for a failed password reset.
      *
     /**
      * Get the response for a failed password reset.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $response
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $response
+     *

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetFailedResponse(Request $request, $response)
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetFailedResponse(Request $request, $response)