Completed
Pull Request — develop (#57)
by Tony
06:32
created
app/Settings.php 2 patches
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
- * Settings.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
+     * Settings.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\Settings;
26 26
 
27 27
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -50,8 +50,7 @@  discard block
 block discarded – undo
50 50
                 DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]);
51 51
                 Cache::put($k, $v, $this->cache_time);
52 52
             }
53
-        }
54
-        else {
53
+        } else {
55 54
             DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]);
56 55
             Cache::put($key, $value, $this->cache_time);
57 56
         }
@@ -68,16 +67,14 @@  discard block
 block discarded – undo
68 67
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
69 68
                 // return a bare value if we are getting one item
70 69
                 return $db_data->first()->config_value;
71
-            }
72
-            elseif (count($db_data) >= 1) {
70
+            } elseif (count($db_data) >= 1) {
73 71
                 $result = self::collectionToArray($db_data, $key);
74 72
                 $config = Config::get('config.' . $key, $default);
75 73
                 if (!is_null($config)) {
76 74
                     $result = array_replace_recursive($config, $result);
77 75
                 }
78 76
                 return $result;
79
-            }
80
-            else {
77
+            } else {
81 78
                 return Config::get('config.' . $key, $default);
82 79
             }
83 80
 
@@ -166,8 +163,7 @@  discard block
 block discarded – undo
166 163
             $currentPath = array_merge($path, array($key));
167 164
             if (is_array($val)) {
168 165
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
169
-            }
170
-            else {
166
+            } else {
171 167
                 $result[$prefix . join('.', $currentPath)] = $val;
172 168
             }
173 169
         }
Please login to merge, or discard this patch.
app/Http/Controllers/SettingsController.php 1 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
- * SettingsController.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
+     * SettingsController.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
 
26 26
 namespace App\Http\Controllers;
27 27
 
Please login to merge, or discard this patch.
app/Providers/SettingsServiceProvider.php 1 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
- * SettingsServiceProvider.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
+     * SettingsServiceProvider.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
 
26 26
 namespace App\Providers;
27 27
 
Please login to merge, or discard this patch.