Move logFailedAccess into Activity

[bookstack] / app / Http / Controllers / SettingController.php

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 1146f22c749ec8df442dfe6a278b3922a3a1fdea..892b2d9cf0e0b5c7f9dd174e552a640790d191e7 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,11 +1,10 @@
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\User;
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Auth\User;

+use BookStack\Notifications\TestEmail;

 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;

-use Illuminate\Http\Response;
-use Setting;

 
 class SettingController extends Controller
 {
 
 class SettingController extends Controller
 {


@@ -13,7 +12,6 @@ class SettingController extends Controller
 
     /**
      * SettingController constructor.
 
     /**
      * SettingController constructor.

-     * @param $imageRepo

      */
     public function __construct(ImageRepo $imageRepo)
     {
      */
     public function __construct(ImageRepo $imageRepo)
     {


@@ -21,10 +19,8 @@ class SettingController extends Controller
         parent::__construct();
     }
 
         parent::__construct();
     }
 

-

     /**
      * Display a listing of the settings.
     /**
      * Display a listing of the settings.

-     * @return Response

      */
     public function index()
     {
      */
     public function index()
     {


@@ -42,8 +38,6 @@ class SettingController extends Controller
 
     /**
      * Update the specified settings in storage.
 
     /**
      * Update the specified settings in storage.

-     * @param  Request $request
-     * @return Response

      */
     public function update(Request $request)
     {
      */
     public function update(Request $request)
     {


@@ -77,12 +71,12 @@ class SettingController extends Controller
         }
 
         $this->showSuccessNotification(trans('settings.settings_save_success'));
         }
 
         $this->showSuccessNotification(trans('settings.settings_save_success'));

-        return redirect('/settings');
+        $redirectLocation = '/settings#' . $request->get('section', '');
+        return redirect(rtrim($redirectLocation, '#'));

     }
 
     /**
      * Show the page for application maintenance.
     }
 
     /**
      * Show the page for application maintenance.

-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      */
     public function showMaintenance()
     {
      */
     public function showMaintenance()
     {


@@ -97,9 +91,6 @@ class SettingController extends Controller
 
     /**
      * Action to clean-up images in the system.
 
     /**
      * Action to clean-up images in the system.

-     * @param Request $request
-     * @param ImageService $imageService
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

      */
     public function cleanupImages(Request $request, ImageService $imageService)
     {
      */
     public function cleanupImages(Request $request, ImageService $imageService)
     {


@@ -123,4 +114,17 @@ class SettingController extends Controller
 
         return redirect('/settings/maintenance#image-cleanup')->withInput();
     }
 
         return redirect('/settings/maintenance#image-cleanup')->withInput();
     }

+
+    /**
+     * Action to send a test e-mail to the current user.
+     */
+    public function sendTestEmail()
+    {
+        $this->checkPermission('settings-manage');
+
+        user()->notify(new TestEmail());
+        $this->showSuccessNotification(trans('settings.maint_send_test_email_success', ['address' => user()->email]));
+
+        return redirect('/settings/maintenance#image-cleanup')->withInput();
+    }

 }
 }