Update settings.php

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 650833c7f33bd7a9a5d5e6e97a4446688c22b775..feb6521f3a69a68bedbe4573d1edfac098da01aa 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,15 +38,13 @@ 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)
     {

-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();

         $this->checkPermission('settings-manage');
         $this->validate($request, [
         $this->checkPermission('settings-manage');
         $this->validate($request, [

-            'app_logo' => $this->imageRepo->getImageValidationRules(),
+            'app_logo' => 'nullable|' . $this->getImageValidationRules(),

         ]);
 
         // Cycles through posted settings and update them
         ]);
 
         // Cycles through posted settings and update them


@@ -63,7 +57,7 @@ class SettingController extends Controller
         }
 
         // Update logo image if set
         }
 
         // Update logo image if set

-        if ($request->has('app_logo')) {
+        if ($request->hasFile('app_logo')) {

             $logoFile = $request->file('app_logo');
             $this->imageRepo->destroyByType('system');
             $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
             $logoFile = $request->file('app_logo');
             $this->imageRepo->destroyByType('system');
             $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);


@@ -76,13 +70,13 @@ class SettingController extends Controller
             setting()->remove('app-logo');
         }
 
             setting()->remove('app-logo');
         }
 

-        session()->flash('success', trans('settings.settings_save_success'));
-        return redirect('/settings');
+        $this->showSuccessNotification(trans('settings.settings_save_success'));
+        $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)
     {


@@ -111,16 +102,35 @@ class SettingController extends Controller
         $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);
         $deleteCount = count($imagesToDelete);
         if ($deleteCount === 0) {
         $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);
         $deleteCount = count($imagesToDelete);
         if ($deleteCount === 0) {

-            session()->flash('warning', trans('settings.maint_image_cleanup_nothing_found'));
+            $this->showWarningNotification(trans('settings.maint_image_cleanup_nothing_found'));

             return redirect('/settings/maintenance')->withInput();
         }
 
         if ($dryRun) {
             session()->flash('cleanup-images-warning', trans('settings.maint_image_cleanup_warning', ['count' => $deleteCount]));
         } else {
             return redirect('/settings/maintenance')->withInput();
         }
 
         if ($dryRun) {
             session()->flash('cleanup-images-warning', trans('settings.maint_image_cleanup_warning', ['count' => $deleteCount]));
         } else {

-            session()->flash('success', trans('settings.maint_image_cleanup_success', ['count' => $deleteCount]));
+            $this->showSuccessNotification(trans('settings.maint_image_cleanup_success', ['count' => $deleteCount]));
+        }
+
+        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');
+
+        try {
+            user()->notify(new TestEmail());
+            $this->showSuccessNotification(trans('settings.maint_send_test_email_success', ['address' => user()->email]));
+        } catch (\Exception $exception) {
+            $errorMessage = trans('errors.maintenance_test_email_failure') . "\n" . $exception->getMessage();
+            $this->showErrorNotification($errorMessage);

         }
 
         }
 

+

         return redirect('/settings/maintenance#image-cleanup')->withInput();
     }
 }
         return redirect('/settings/maintenance#image-cleanup')->withInput();
     }
 }