Update settings.php

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index d9d66042e19ba0bc998d0b74e14b0855b14ff4be..feb6521f3a69a68bedbe4573d1edfac098da01aa 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,15 +1,26 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

-use BookStack\Services\ImageService;
+use BookStack\Auth\User;
+use BookStack\Notifications\TestEmail;
+use BookStack\Uploads\ImageRepo;
+use BookStack\Uploads\ImageService;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

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

 
 class SettingController extends Controller
 {
 
 class SettingController extends Controller
 {

+    protected $imageRepo;
+
+    /**
+     * SettingController constructor.
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
+    }
+

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

-     * @return Response

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


@@ -19,18 +30,22 @@ class SettingController extends Controller
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 

-        return view('settings/index', ['version' => $version]);
+        return view('settings.index', [
+            'version' => $version,
+            'guestUser' => User::getDefault()
+        ]);

     }
 
     /**
      * 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->checkPermission('settings-manage');

+        $this->validate($request, [
+            'app_logo' => 'nullable|' . $this->getImageValidationRules(),
+        ]);

 
         // Cycles through posted settings and update them
         foreach ($request->all() as $name => $value) {
 
         // Cycles through posted settings and update them
         foreach ($request->all() as $name => $value) {


@@ -38,16 +53,30 @@ class SettingController extends Controller
                 continue;
             }
             $key = str_replace('setting-', '', trim($name));
                 continue;
             }
             $key = str_replace('setting-', '', trim($name));

-            Setting::put($key, $value);
+            setting()->put($key, $value);

         }
 
         }
 

-        session()->flash('success', trans('settings.settings_save_success'));
-        return redirect('/settings');
+        // Update logo image if set
+        if ($request->hasFile('app_logo')) {
+            $logoFile = $request->file('app_logo');
+            $this->imageRepo->destroyByType('system');
+            $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
+            setting()->put('app-logo', $image->url);
+        }
+
+        // Clear logo image if requested
+        if ($request->get('app_logo_reset', null)) {
+            $this->imageRepo->destroyByType('system');
+            setting()->remove('app-logo');
+        }
+
+        $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()
     {


@@ -57,14 +86,11 @@ class SettingController extends Controller
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 

-        return view('settings/maintenance', ['version' => $version]);
+        return view('settings.maintenance', ['version' => $version]);

     }
 
     /**
      * 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)
     {


@@ -76,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();
     }
 }