Fixed role permission removal bug

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index dfda2b6cf211f367755e9914225115a053c45522..70a12631a2929d43424149208a79350697caaa4b 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,32 +1,29 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
-
-use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
+use Illuminate\Http\Response;
 use Setting;
 
 class SettingController extends Controller
 {
     /**
      * Display a listing of the settings.
-     *
      * @return Response
      */
     public function index()
     {
         $this->checkPermission('settings-manage');
         $this->setPageTitle('Settings');
-        return view('settings/index');
-    }
 
+        // Get application version
+        $version = trim(file_get_contents(base_path('version')));
+
+        return view('settings/index', ['version' => $version]);
+    }
 
     /**
      * Update the specified settings in storage.
-     *
-     * @param  Request  $request
+     * @param  Request $request
      * @return Response
      */
     public function update(Request $request)
@@ -35,64 +32,14 @@ class SettingController extends Controller
         $this->checkPermission('settings-manage');
 
         // 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) {
+            if (strpos($name, 'setting-') !== 0) continue;
             $key = str_replace('setting-', '', trim($name));
-            if($key == 'app-color') {
-                Setting::put('app-color-rgba', $this->hex2rgba($value, 0.15));
-            }
             Setting::put($key, $value);
         }
 
-        session()->flash('success', 'Settings Saved');
+        session()->flash('success', trans('settings.settings_save_success'));
         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;
-        }
-        // Trim any whitespace
-        $color = trim($color);
-
-        // Sanitize $color if "#" is provided
-        if($color[0] == '#' ) {
-            $color = substr($color, 1);
-        }
-
-        // 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);
-
-        // 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;
-    }
-
 }