Updated issue template and added TinyMCE autolinking

[bookstack] / app / Services / SettingService.php

diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php
index 1dc30f8a001e901500486add7266e0dad3ce0bdb..40094a513ed33deefb705b578b5903f2ae9174a8 100644 (file)
--- a/app/Services/SettingService.php
+++ b/app/Services/SettingService.php
@@ -1,6 +1,7 @@
 <?php namespace BookStack\Services;
 
 use BookStack\Setting;
 <?php namespace BookStack\Services;
 
 use BookStack\Setting;

+use BookStack\User;

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


@@ -43,6 +44,18 @@ class SettingService
         return $this->formatValue($value, $default);
     }
 
         return $this->formatValue($value, $default);
     }
 

+    /**
+     * Get a user-specific setting from the database or cache.
+     * @param User $user
+     * @param $key
+     * @param bool $default
+     * @return bool|string
+     */
+    public function getUser($user, $key, $default = false)
+    {
+        return $this->get($this->userKey($user->id, $key), $default);
+    }
+

     /**
      * Gets a setting value from the cache or database.
      * Looks at the system defaults if not cached or in database.
     /**
      * Gets a setting value from the cache or database.
      * Looks at the system defaults if not cached or in database.


@@ -111,6 +124,16 @@ class SettingService
         return $setting !== null;
     }
 
         return $setting !== null;
     }
 

+    /**
+     * Check if a user setting is in the database.
+     * @param $key
+     * @return bool
+     */
+    public function hasUser($key)
+    {
+        return $this->has($this->userKey($key));
+    }
+

     /**
      * Add a setting to the database.
      * @param $key
     /**
      * Add a setting to the database.
      * @param $key


@@ -128,6 +151,28 @@ class SettingService
         return true;
     }
 
         return true;
     }
 

+    /**
+     * Put a user-specific setting into the database.
+     * @param User $user
+     * @param $key
+     * @param $value
+     * @return bool
+     */
+    public function putUser($user, $key, $value)
+    {
+        return $this->put($this->userKey($user->id, $key), $value);
+    }
+
+    /**
+     * Convert a setting key into a user-specific key.
+     * @param $key
+     * @return string
+     */
+    protected function userKey($userId, $key = '')
+    {
+        return 'user:' . $userId . ':' . $key;
+    }
+

     /**
      * Removes a setting from the database.
      * @param $key
     /**
      * Removes a setting from the database.
      * @param $key


@@ -143,6 +188,16 @@ class SettingService
         return true;
     }
 
         return true;
     }
 

+    /**
+     * Delete settings for a given user id.
+     * @param $userId
+     * @return mixed
+     */
+    public function deleteUserSettings($userId)
+    {
+        return $this->setting->where('setting_key', 'like', $this->userKey($userId) . '%')->delete();
+    }
+

     /**
      * Gets a setting model from the database for the given key.
      * @param $key
     /**
      * Gets a setting model from the database for the given key.
      * @param $key