Completed
Pull Request — develop (#57)
by Tony
06:12
created
app/Http/Controllers/SettingsController.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (C) 2016 Tony Murray <[email protected]>
4
- * This program is free software: you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation, either version 3 of the License, or
7
- * (at your option) any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
12
- * GNU General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU General Public License
15
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
- */
3
+     * Copyright (C) 2016 Tony Murray <[email protected]>
4
+     * This program is free software: you can redistribute it and/or modify
5
+     * it under the terms of the GNU General Public License as published by
6
+     * the Free Software Foundation, either version 3 of the License, or
7
+     * (at your option) any later version.
8
+     *
9
+     * This program is distributed in the hope that it will be useful,
10
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
12
+     * GNU General Public License for more details.
13
+     *
14
+     * You should have received a copy of the GNU General Public License
15
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
+     */
17 17
 
18 18
 namespace App\Http\Controllers;
19 19
 
Please login to merge, or discard this patch.
app/Models/DbConfig.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
     public function scopeKey($query, $key)
51 51
     {
52
-        return $query->where('config_name', 'LIKE', $key . '%');
52
+        return $query->where('config_name', 'LIKE', $key.'%');
53 53
     }
54 54
 
55 55
     public function scopeExactKey($query, $key)
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * DbConfig.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * DbConfig.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Models;
26 26
 
27 27
 use Illuminate\Database\Eloquent\Model;
Please login to merge, or discard this patch.
app/Settings/Settings.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 use Cache;
30 30
 use Config;
31 31
 use DB;
32
-use Illuminate\Contracts\Config\Repository as ConfigContract;  // adds the possibility to replace the default Config facade
32
+use Illuminate\Contracts\Config\Repository as ConfigContract; // adds the possibility to replace the default Config facade
33 33
 
34 34
 class Settings implements ConfigContract
35 35
 {
@@ -62,18 +62,18 @@  discard block
 block discarded – undo
62 62
     public function get($key, $default = null)
63 63
     {
64 64
         // return value from cache or fetch it and return it
65
-        return Cache::remember($key, $this->cache_time, function () use ($key, $default) {
65
+        return Cache::remember($key, $this->cache_time, function() use ($key, $default) {
66 66
             $value = $this->database->get($key, $default);
67 67
 
68 68
             if (is_array($value)) {
69 69
                 $value = self::pathToArray($value, $key);
70
-                $config = Config::get('config.' . $key, $default);
70
+                $config = Config::get('config.'.$key, $default);
71 71
                 if (!is_null($config)) {
72 72
                     $value = array_replace_recursive($config, $value);
73 73
                 }
74 74
             }
75 75
             elseif (is_null($value)) {
76
-                return Config::get('config.' . $key);
76
+                return Config::get('config.'.$key);
77 77
             }
78 78
 
79 79
             return $value;
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     private static function recursive_keys(array $array, $prefix = "", array $path = array())
151 151
     {
152 152
         if ($prefix != "") {
153
-            $prefix = trim($prefix, '.') . '.';
153
+            $prefix = trim($prefix, '.').'.';
154 154
         }
155 155
         $result = array();
156 156
         foreach ($array as $key => $val) {
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
160 160
             }
161 161
             else {
162
-                $result[$prefix . join('.', $currentPath)] = $val;
162
+                $result[$prefix.join('.', $currentPath)] = $val;
163 163
             }
164 164
         }
165 165
         return $result;
Please login to merge, or discard this patch.