Fixes padding issues of the sidebar's items

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index dfda2b6cf211f367755e9914225115a053c45522..d9f172081ef2efb2851c0dacbc5937e2cc8c7e71 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -2,97 +2,79 @@
 
 namespace BookStack\Http\Controllers;
 
+use BookStack\Actions\ActivityType;
+use BookStack\Auth\User;
+use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 
-use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
-use Setting;
-
 class SettingController extends Controller
 {
+    protected $imageRepo;
+
+    /**
+     * SettingController constructor.
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+    }
+
     /**
      * Display a listing of the settings.
-     *
-     * @return Response
      */
     public function index()
     {
         $this->checkPermission('settings-manage');
-        $this->setPageTitle('Settings');
-        return view('settings/index');
-    }
+        $this->setPageTitle(trans('settings.settings'));
 
+        // Get application version
+        $version = trim(file_get_contents(base_path('version')));
+
+        return view('settings.index', [
+            'version'   => $version,
+            'guestUser' => User::getDefault(),
+        ]);
+    }
 
     /**
      * Update the specified settings in storage.
-     *
-     * @param  Request  $request
-     * @return Response
      */
     public function update(Request $request)
     {
-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();
         $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) {
-            if(strpos($name, 'setting-') !== 0) continue;
+        foreach ($request->all() as $name => $value) {
             $key = str_replace('setting-', '', trim($name));
-            if($key == 'app-color') {
-                Setting::put('app-color-rgba', $this->hex2rgba($value, 0.15));
+            if (strpos($name, 'setting-') !== 0) {
+                continue;
             }
-            Setting::put($key, $value);
+            setting()->put($key, $value);
         }
 
-        session()->flash('success', 'Settings Saved');
-        return redirect('/settings');
-    }
-
-    /**
-     * Adapted from http://mekshq.com/how-to-convert-hexadecimal-color-code-to-rgb-or-rgba-using-php/
-     * Converts a hex color code in to an RGBA string.
-     *
-     * @param string $color
-     * @param float|boolean $opacity
-     * @return boolean|string
-     */
-    protected function hex2rgba($color, $opacity = false)
-    {
-        // Return false if no color provided
-        if(empty($color)) {
-            return false;
+        // 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);
         }
-        // Trim any whitespace
-        $color = trim($color);
 
-        // Sanitize $color if "#" is provided
-        if($color[0] == '#' ) {
-            $color = substr($color, 1);
+        // Clear logo image if requested
+        if ($request->get('app_logo_reset', null)) {
+            $this->imageRepo->destroyByType('system');
+            setting()->remove('app-logo');
         }
 
-        // Check if color has 6 or 3 characters and get values
-        if(strlen($color) == 6) {
-            $hex = array( $color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5] );
-        } elseif( strlen( $color ) == 3 ) {
-            $hex = array( $color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2] );
-        } else {
-            return false;
-        }
-
-        // Convert hexadec to rgb
-        $rgb =  array_map('hexdec', $hex);
+        $section = $request->get('section', '');
+        $this->logActivity(ActivityType::SETTINGS_UPDATE, $section);
+        $this->showSuccessNotification(trans('settings.settings_save_success'));
+        $redirectLocation = '/settings#' . $section;
 
-        // Check if opacity is set(rgba or rgb)
-        if($opacity) {
-            if(abs($opacity) > 1)
-                $opacity = 1.0;
-            $output = 'rgba('.implode(",",$rgb).','.$opacity.')';
-        } else {
-            $output = 'rgb('.implode(",",$rgb).')';
-        }
-
-        // Return rgb(a) color string
-        return $output;
+        return redirect(rtrim($redirectLocation, '#'));
     }
-
 }