librenms / librenmsv2

app/Http/Controllers/SettingsController.php

Unused Use Statements -2 removed lines

@@ -17,8 +17,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests;
-use App\Models\DbConfig;
 use Illuminate\Http\Request;
 use Settings;
 

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * SettingsController.php
- *
- * @package    LibreNMS
- * @author     Tony Murray <murraytony@gmail.com>
- * @copyright  2016 Tony Murray
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
- */
+     * SettingsController.php
+     *
+     * @package    LibreNMS
+     * @author     Tony Murray <murraytony@gmail.com>
+     * @copyright  2016 Tony Murray
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
+     */
 
 namespace App\Http\Controllers;
 

app/Models/DbConfig.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
     public function scopeKey($query, $key)
     {
-        return $query->where('config_name', 'LIKE', $key . '%');
+        return $query->where('config_name', 'LIKE', $key.'%');
     }
 
     public function scopeExactKey($query, $key)

app/Settings.php

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
      * Clear the settings cache.
      * If path is set, only clear the path and it's parents.
      *
-     * @param null $key The path to clear.
+     * @param string $key The path to clear.
      */
     public function flush($key = null)
     {

Spacing +8 added lines, -8 removed lines

@@ -69,11 +69,11 @@ 
                 if (!empty($key)) {
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
                         // check that we aren't trying to set an array onto an existing value only setting
-                        throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
+                        throw new \Exception("Attempting to set array value to existing non-array value at the key '".$key."'");
                     }
                     else {
                         // we are not at the leaf yet, add this chunk to the key and recurse
-                        $this->set($key . '.' . $k, $v);
+                        $this->set($key.'.'.$k, $v);
                     }
                 }
                 else {
@@ -85,7 +85,7 @@ 
         else {
             // make sure we can save this
             if ($this->isReadOnly($key)) {
-                throw new \Exception("The setting '" . $key . "' is read only");
+                throw new \Exception("The setting '".$key."' is read only");
             }
 
             // flush the cache and save the value in db and cache
@@ -106,10 +106,10 @@ 
     public function get($key, $default = null)
     {
         // return value from cache or fetch it and return it
-        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) {
+        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) {
             // fetch the value from config.php first
-            if (Config::has('config.' . $key)) {
-                $config_data = Config::get('config.' . $key, $default);
+            if (Config::has('config.'.$key)) {
+                $config_data = Config::get('config.'.$key, $default);
                 if (!is_array($config_data)) {
                     // return the value from config.php if it is a value
                     return $config_data;
@@ -175,7 +175,7 @@ 
      */
     public function has($key)
     {
-        return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.' . $key) || DbConfig::key($key)->exists());
+        return (Cache::tags(self::$cache_tag)->has($key) || Config::has('config.'.$key) || DbConfig::key($key)->exists());
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     public function isReadOnly($key)
     {
-        return Config::has('config.' . $key);
+        return Config::has('config.'.$key);
     }
 
     /**

Braces +6 added lines, -12 removed lines

@@ -70,19 +70,16 @@ 
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
                         // check that we aren't trying to set an array onto an existing value only setting
                         throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
-                    }
-                    else {
+                    } else {
                         // we are not at the leaf yet, add this chunk to the key and recurse
                         $this->set($key . '.' . $k, $v);
                     }
-                }
-                else {
+                } else {
                     // a leaf, recurse one last time
                     $this->set($k, $v);
                 }
             }
-        }
-        else {
+        } else {
             // make sure we can save this
             if ($this->isReadOnly($key)) {
                 throw new \Exception("The setting '" . $key . "' is read only");
@@ -122,16 +119,14 @@ 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
                 // return a value if we are getting one item
                 return $db_data->first()->config_value;
-            }
-            elseif (count($db_data) >= 1) {
+            } elseif (count($db_data) >= 1) {
                 // convert the collection to an array
                 $result = self::collectionToArray($db_data, $key);
 
                 // if we have config_data, merge them
                 if (isset($config_data)) {
                     return array_replace_recursive($result, $config_data);
-                }
-                else {
+                } else {
                     return $result;
                 }
             }
@@ -227,8 +222,7 @@ 
         if (is_null($key)) {
             // Clear all cache
             Cache::tags(self::$cache_tag)->flush();
-        }
-        else {
+        } else {
             // Clear specific path
             $path = [];
             foreach (explode('.', $key) as $element) {