Fixed canonical redirects on non-root url app instances

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 70a12631a2929d43424149208a79350697caaa4b..50d91d3881e39362908bfe30aaa3a8168042355b 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,45 +1,75 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

+use BookStack\Auth\User;
+use BookStack\Uploads\ImageRepo;

 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()
     {
         $this->checkPermission('settings-manage');
      */
     public function index()
     {
         $this->checkPermission('settings-manage');

-        $this->setPageTitle('Settings');
+        $this->setPageTitle(trans('settings.settings'));

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

-            if (strpos($name, 'setting-') !== 0) continue;
+            if (strpos($name, 'setting-') !== 0) {
+                continue;
+            }

             $key = str_replace('setting-', '', trim($name));
             $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, '#'));
+    }

 }
 }