Completed
Pull Request — develop (#69)
by
unknown
07:42
created
app/Api/Controllers/APIController.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
         $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version;
17 17
         $versions['php']       = phpversion();
18 18
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
19
-	if ($versions['db_driver'] == 'SQLITE') {
19
+    if ($versions['db_driver'] == 'SQLITE') {
20 20
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
21 21
         }
22 22
         else {
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Api/Controllers/PortController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Http/Controllers/NotificationController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@
 block discarded – undo
43 43
         }
44 44
 
45 45
         if ($action == 'read') {
46
-           $result = $notification->markRead($enable);
46
+            $result = $notification->markRead($enable);
47 47
         }
48 48
         elseif ($action == 'sticky') {
49
-           $result = $notification->markSticky(false);
49
+            $result = $notification->markSticky(false);
50 50
         }
51 51
 
52 52
         if ($result === false) {
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@  discard block
 block discarded – undo
27 27
         if ($type === 'archive')
28 28
         {
29 29
             $notifications = Notification::IsArchived($request)->get();
30
-        }
31
-        else {
30
+        } else {
32 31
             $notifications = Notification::IsUnread()->get();
33 32
         }
34 33
         return $notifications;
@@ -45,15 +44,13 @@  discard block
 block discarded – undo
45 44
 
46 45
         if ($action == 'read') {
47 46
            $result = $notification->markRead($enable);
48
-        }
49
-        elseif ($action == 'sticky') {
47
+        } elseif ($action == 'sticky') {
50 48
            $result = $notification->markSticky(false);
51 49
         }
52 50
 
53 51
         if ($result === false) {
54 52
             return $this->response->errorInternal();
55
-        }
56
-        else {
53
+        } else {
57 54
             return $this->response->array(array('statusText' => 'OK'));
58 55
         }
59 56
     }
@@ -73,8 +70,7 @@  discard block
 block discarded – undo
73 70
         if ($notification->save())
74 71
         {
75 72
             return $this->response->array(array('statusText' => 'OK'));
76
-        }
77
-        else {
73
+        } else {
78 74
             return $this->response->errorInternal();
79 75
         }
80 76
     }
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Models/Notification.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     public function list_devices(Request $request) {
18 18
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
19 19
             return Devices::all();
20
-        }
21
-        else {
20
+        } else {
22 21
             return User::find($request->user()->user_id)->devices()->get();
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Facades/Settings.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
- * 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.
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   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -70,19 +70,16 @@  discard block
 block discarded – undo
70 70
                     if (is_string($k) && !str_contains($k, '.') && DbConfig::exactKey($key)->exists() && DbConfig::key($key)->count() == 1) {
71 71
                         // check that we aren't trying to set an array onto an existing value only setting
72 72
                         throw new \Exception("Attempting to set array value to existing non-array value at the key '" . $key . "'");
73
-                    }
74
-                    else {
73
+                    } else {
75 74
                         // we are not at the leaf yet, add this chunk to the key and recurse
76 75
                         $this->set($key . '.' . $k, $v);
77 76
                     }
78
-                }
79
-                else {
77
+                } else {
80 78
                     // a leaf, recurse one last time
81 79
                     $this->set($k, $v);
82 80
                 }
83 81
             }
84
-        }
85
-        else {
82
+        } else {
86 83
             // make sure we can save this
87 84
             if ($this->isReadOnly($key)) {
88 85
                 throw new \Exception("The setting '" . $key . "' is read only");
@@ -122,16 +119,14 @@  discard block
 block discarded – undo
122 119
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
123 120
                 // return a value if we are getting one item
124 121
                 return $db_data->first()->config_value;
125
-            }
126
-            elseif (count($db_data) >= 1) {
122
+            } elseif (count($db_data) >= 1) {
127 123
                 // convert the collection to an array
128 124
                 $result = self::collectionToArray($db_data, $key);
129 125
 
130 126
                 // if we have config_data, merge them
131 127
                 if (isset($config_data)) {
132 128
                     return array_replace_recursive($result, $config_data);
133
-                }
134
-                else {
129
+                } else {
135 130
                     return $result;
136 131
                 }
137 132
             }
@@ -227,8 +222,7 @@  discard block
 block discarded – undo
227 222
         if (is_null($key)) {
228 223
             // Clear all cache
229 224
             Cache::tags(self::$cache_tag)->flush();
230
-        }
231
-        else {
225
+        } else {
232 226
             // Clear specific path
233 227
             $path = [];
234 228
             foreach (explode('.', $key) as $element) {
Please login to merge, or discard this patch.