Closes #55. Allows you to set the primary color.

[bookstack] / app / Services / SettingService.php

diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php
index cab29f454f9689c88bc85f39c47258afcca9808d..bcc7eae31a0a8c3713eb5f6935875f84be81aa45 100644 (file)
--- a/app/Services/SettingService.php
+++ b/app/Services/SettingService.php
@@ -1,6 +1,6 @@
-<?php namespace Oxbow\Services;
+<?php namespace BookStack\Services;

 
 

-use Oxbow\Setting;
+use BookStack\Setting;

 use Illuminate\Contracts\Cache\Repository as Cache;
 
 /**
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 /**


@@ -8,7 +8,7 @@ use Illuminate\Contracts\Cache\Repository as Cache;
  *
  * The settings are a simple key-value database store.
  *
  *
  * The settings are a simple key-value database store.
  *

- * @package Oxbow\Services
+ * @package BookStack\Services

  */
 class SettingService
 {
  */
 class SettingService
 {


@@ -38,7 +38,7 @@ class SettingService
      */
     public function get($key, $default = false)
     {
      */
     public function get($key, $default = false)
     {

-        $value =  $this->getValueFromStore($key, $default);
+        $value = $this->getValueFromStore($key, $default);

         return $this->formatValue($value, $default);
     }
 
         return $this->formatValue($value, $default);
     }
 


@@ -50,13 +50,17 @@ class SettingService
      */
     protected function getValueFromStore($key, $default)
     {
      */
     protected function getValueFromStore($key, $default)
     {

+        $overrideValue = $this->getOverrideValue($key);
+        if ($overrideValue !== null) return $overrideValue;
+

         $cacheKey = $this->cachePrefix . $key;
         if ($this->cache->has($cacheKey)) {
             return $this->cache->get($cacheKey);
         }
 
         $settingObject = $this->getSettingObjectByKey($key);
         $cacheKey = $this->cachePrefix . $key;
         if ($this->cache->has($cacheKey)) {
             return $this->cache->get($cacheKey);
         }
 
         $settingObject = $this->getSettingObjectByKey($key);

-        if($settingObject !== null) {
+
+        if ($settingObject !== null) {

             $value = $settingObject->value;
             $this->cache->forever($cacheKey, $value);
             return $value;
             $value = $settingObject->value;
             $this->cache->forever($cacheKey, $value);
             return $value;


@@ -65,6 +69,10 @@ class SettingService
         return $default;
     }
 
         return $default;
     }
 

+    /**
+     * Clear an item from the cache completely.
+     * @param $key
+     */

     protected function clearFromCache($key)
     {
         $cacheKey = $this->cachePrefix . $key;
     protected function clearFromCache($key)
     {
         $cacheKey = $this->cachePrefix . $key;


@@ -136,9 +144,23 @@ class SettingService
      * @param $key
      * @return mixed
      */
      * @param $key
      * @return mixed
      */

-    private function getSettingObjectByKey($key)
+    protected function getSettingObjectByKey($key)

     {
         return $this->setting->where('setting_key', '=', $key)->first();
     }
 
     {
         return $this->setting->where('setting_key', '=', $key)->first();
     }
 

+
+    /**
+     * Returns an override value for a setting based on certain app conditions.
+     * Used where certain configuration options overrule others.
+     * Returns null if no override value is available.
+     * @param $key
+     * @return bool|null
+     */
+    protected function getOverrideValue($key)
+    {
+        if ($key === 'registration-enabled' && config('auth.method') === 'ldap') return false;
+        return null;
+    }
+

 }
\ No newline at end of file
 }
\ No newline at end of file