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

Indentation +7 added lines, -7 removed lines

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

Braces +4 added lines, -8 removed lines

@@ -50,8 +50,7 @@ 
                 DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]);
                 Cache::put($k, $v, $this->cache_time);
             }
-        }
-        else {
+        } else {
             DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]);
             Cache::put($key, $value, $this->cache_time);
         }
@@ -68,16 +67,14 @@ 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
                 // return a bare value if we are getting one item
                 return $db_data->first()->config_value;
-            }
-            elseif (count($db_data) >= 1) {
+            } elseif (count($db_data) >= 1) {
                 $result = self::collectionToArray($db_data, $key);
                 $config = Config::get('config.' . $key, $default);
                 if (!is_null($config)) {
                     $result = array_replace_recursive($config, $result);
                 }
                 return $result;
-            }
-            else {
+            } else {
                 return Config::get('config.' . $key, $default);
             }
 
@@ -166,8 +163,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;
             }
         }

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
 use App\Models\DbConfig;
 use Cache;
 use Config;
-use Illuminate\Contracts\Config\Repository as ConfigContract;  // adds the possibility to replace the default Config facade
+use Illuminate\Contracts\Config\Repository as ConfigContract; // adds the possibility to replace the default Config facade
 
 class Settings implements ConfigContract
 {
@@ -85,7 +85,7 @@ 
     public function get($key, $default = null)
     {
         // return value from cache or fetch it and return it
-        return Cache::remember($key, $this->cache_time, function () use ($key, $default) {
+        return Cache::remember($key, $this->cache_time, function() use ($key, $default) {
             $db_data = DbConfig::key($key)->get(['config_name', 'config_value']);
 
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
@@ -95,7 +95,7 @@ 
             elseif (count($db_data) >= 1) {
                 // convert collection to an array and merge with the config fallback
                 $result = self::collectionToArray($db_data, $key);
-                $config = Config::get('config.' . $key, $default);
+                $config = Config::get('config.'.$key, $default);
                 if (!is_null($config) && is_array($config)) {
                     $result = array_replace_recursive($config, $result);
                 }
@@ -103,7 +103,7 @@ 
             }
             else {
                 // fallback to the config or return the default value
-                return Config::get('config.' . $key, $default);
+                return Config::get('config.'.$key, $default);
             }
 
         });
@@ -212,7 +212,7 @@ 
     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) {
@@ -221,7 +221,7 @@ 
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
             }
             else {
-                $result[$prefix . join('.', $currentPath)] = $val;
+                $result[$prefix.join('.', $currentPath)] = $val;
             }
         }
         return $result;

app/Providers/SettingsServiceProvider.php

Indentation +7 added lines, -7 removed lines

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