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/Settings/Settings.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -49,8 +49,7 @@  discard block
 block discarded – undo
49 49
                 $this->database->set($k, $v);
50 50
 //            Cache::put($key, $v);
51 51
             }
52
-        }
53
-        else {
52
+        } else {
54 53
             $this->database->set($key, $value);
55 54
         }
56 55
 //            Cache::put($key, $v);
@@ -68,8 +67,7 @@  discard block
 block discarded – undo
68 67
                 if (!is_null($config)) {
69 68
                     $value = array_replace_recursive($config, $value);
70 69
                 }
71
-            }
72
-            elseif (is_null($value)) {
70
+            } elseif (is_null($value)) {
73 71
                 $value = Config::get('config.' . $key);
74 72
             }
75 73
 
@@ -135,8 +133,7 @@  discard block
 block discarded – undo
135 133
             $currentPath = array_merge($path, array($key));
136 134
             if (is_array($val)) {
137 135
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
138
-            }
139
-            else {
136
+            } else {
140 137
                 $result[$prefix . join('.', $currentPath)] = $val;
141 138
             }
142 139
         }
Please login to merge, or discard this patch.
app/Settings/DatabaseRepository.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@  discard block
 block discarded – undo
42 42
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
43 43
         if (count($results) > 1) {
44 44
             return $this->collectionToArray($results);
45
-        }
46
-        elseif (count($results) == 1) {
45
+        } elseif (count($results) == 1) {
47 46
             $entry = $results->first();
48 47
             if($entry->config_name != $key) { //FIXME: better test
49 48
                 // trim the prefix
@@ -53,8 +52,7 @@  discard block
 block discarded – undo
53 52
 
54 53
             $value = $entry->config_value;
55 54
             return is_null($value) ? $default : $value;
56
-        }
57
-        else {
55
+        } else {
58 56
             return $default;
59 57
         }
60 58
     }
Please login to merge, or discard this patch.
app/Models/DbConfig.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
- * 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.