Applied baseUrl to login redirect

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 5193a9d3bba3b03ce1b6cb764000142cde9ec88e..61ce55fa9405921c65cd5684c33fb4b42cb9d0d1 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,43 +1,47 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
+use BookStack\Http\Requests;
 use Setting;
 
 class SettingController extends Controller
 {
     /**
      * Display a listing of the settings.
-     *
      * @return Response
      */
     public function index()
     {
-        $this->checkPermission('settings-update');
-        return view('settings/index');
-    }
+        $this->checkPermission('settings-manage');
+        $this->setPageTitle('Settings');
 
+        // Get application version
+        $version = false;
+        if (function_exists('exec')) {
+            $version = exec('git describe --always --tags ');
+        }
 
+        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)
     {
-        $this->checkPermission('settings-update');
+        $this->preventAccessForDemoUsers();
+        $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));
             Setting::put($key, $value);
         }
+
         session()->flash('success', 'Settings Saved');
         return redirect('/settings');
     }