librenms / librenmsv2

app/Http/Controllers/SettingsController.php

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Copyright (C) 2016 Tony Murray <murraytony@gmail.com>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+     * Copyright (C) 2016 Tony Murray <murraytony@gmail.com>
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     */
 
 namespace App\Http\Controllers;
 

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;
 

app/Settings/DatabaseRepository.php

Indentation +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
- * DatabaseRepository.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
- */
+     * DatabaseRepository.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\Settings;
 
 

Doc Comments +9 added lines

@@ -32,11 +32,17 @@ 
 {
     // 'config_name', 'config_value'
 
+    /**
+     * @param string $key
+     */
     public function has($key)
     {
         return DbConfig::exactKey($key)->exists();
     }
 
+    /**
+     * @param string $key
+     */
     public function get($key, $default = null)
     {
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
@@ -100,6 +106,9 @@ 
         return $ret;
     }
 
+    /**
+     * @param \Illuminate\Database\Eloquent\Collection $objs
+     */
     private function objsToArray($objs)
     {
         $ret = array();

Unused Use Statements -1 removed lines

@@ -26,7 +26,6 @@
 
 
 use App\Models\DbConfig;
-use App\Models\Notification;
 
 class DatabaseRepository
 {

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         }
         elseif (count($results) == 1) {
             $entry = $results->first();
-            if($entry->config_name != $key) { //FIXME: better test
+            if ($entry->config_name != $key) { //FIXME: better test
                 // trim the prefix
                 $local_key = substr($entry->config_name, strlen($key) + 1);
                 return [$local_key => $entry->config_value];

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
         if (count($results) > 1) {
             return $this->collectionToArray($results);
-        }
-        elseif (count($results) == 1) {
+        } elseif (count($results) == 1) {
             $entry = $results->first();
             if($entry->config_name != $key) { //FIXME: better test
                 // trim the prefix
@@ -53,8 +52,7 @@ 
 
             $value = $entry->config_value;
             return is_null($value) ? $default : $value;
-        }
-        else {
+        } else {
             return $default;
         }
     }

app/Settings/Settings.php

Spacing +7 added lines, -7 removed lines

@@ -64,13 +64,13 @@ 
             $value = $this->database->get($key, $default);
             if (is_array($value)) {
                 $value = self::pathToArray($value, $key);
-                $config = Config::get('config.' . $key, $default);
+                $config = Config::get('config.'.$key, $default);
                 if (!is_null($config)) {
                     $value = array_replace_recursive($config, $value);
                 }
             }
             elseif (is_null($value)) {
-                $value = Config::get('config.' . $key);
+                $value = Config::get('config.'.$key);
             }
 
 //FIXME: insert cache
@@ -101,7 +101,7 @@ 
         return array_replace_recursive($config_settings, $db_settings);
     }
 
-    protected static function pathToArray($data, $prefix="")
+    protected static function pathToArray($data, $prefix = "")
     {
         $tree = array();
         foreach ($data as $key => $value) {
@@ -120,15 +120,15 @@ 
         return $tree;
     }
 
-    protected static function arrayToPath($array, $prefix="")
+    protected static function arrayToPath($array, $prefix = "")
     {
         return self::recursive_keys($array, $prefix);
     }
 
-    private static function recursive_keys(array $array, $prefix="", array $path = array())
+    private static function recursive_keys(array $array, $prefix = "", array $path = array())
     {
         if ($prefix != "") {
-            $prefix = trim($prefix, '.') . '.';
+            $prefix = trim($prefix, '.').'.';
         }
         $result = array();
         foreach ($array as $key => $val) {
@@ -137,7 +137,7 @@ 
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
             }
             else {
-                $result[$prefix . join('.', $currentPath)] = $val;
+                $result[$prefix.join('.', $currentPath)] = $val;
             }
         }
         return $result;

Braces +3 added lines, -6 removed lines

@@ -49,8 +49,7 @@ 
                 $this->database->set($k, $v);
 //            Cache::put($key, $v);
             }
-        }
-        else {
+        } else {
             $this->database->set($key, $value);
         }
 //            Cache::put($key, $v);
@@ -68,8 +67,7 @@ 
                 if (!is_null($config)) {
                     $value = array_replace_recursive($config, $value);
                 }
-            }
-            elseif (is_null($value)) {
+            } elseif (is_null($value)) {
                 $value = Config::get('config.' . $key);
             }
 
@@ -135,8 +133,7 @@ 
             $currentPath = array_merge($path, array($key));
             if (is_array($val)) {
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
-            }
-            else {
+            } else {
                 $result[$prefix . join('.', $currentPath)] = $val;
             }
         }

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)