Added test for logical-theme-system command registration

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

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

 
 

+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityType;

 use BookStack\Auth\User;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use BookStack\Auth\User;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;


@@ -14,7 +17,6 @@ class SettingController extends Controller
     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;
     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -29,8 +31,8 @@ class SettingController extends Controller
         $version = trim(file_get_contents(base_path('version')));
 
         return view('settings.index', [
         $version = trim(file_get_contents(base_path('version')));
 
         return view('settings.index', [

-            'version' => $version,
-            'guestUser' => User::getDefault()
+            'version'   => $version,
+            'guestUser' => User::getDefault(),

         ]);
     }
 
         ]);
     }
 


@@ -42,15 +44,15 @@ class SettingController extends Controller
         $this->preventAccessInDemoMode();
         $this->checkPermission('settings-manage');
         $this->validate($request, [
         $this->preventAccessInDemoMode();
         $this->checkPermission('settings-manage');
         $this->validate($request, [

-            'app_logo' => 'nullable|' . $this->getImageValidationRules(),
+            'app_logo' => array_merge(['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) {

+            $key = str_replace('setting-', '', trim($name));

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

-            $key = str_replace('setting-', '', trim($name));

             setting()->put($key, $value);
         }
 
             setting()->put($key, $value);
         }
 


@@ -68,8 +70,11 @@ class SettingController extends Controller
             setting()->remove('app-logo');
         }
 
             setting()->remove('app-logo');
         }
 

+        $section = $request->get('section', '');
+        $this->logActivity(ActivityType::SETTINGS_UPDATE, $section);

         $this->showSuccessNotification(trans('settings.settings_save_success'));
         $this->showSuccessNotification(trans('settings.settings_save_success'));

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

         return redirect(rtrim($redirectLocation, '#'));
     }
 }
         return redirect(rtrim($redirectLocation, '#'));
     }
 }