Completed
Push — master ( 7d9761...77615c )
by Tony
02:53
created
app/Http/Middleware/Authenticate.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
         if (Auth::guard($guard)->guest()) {
21 21
             if ($request->ajax() || $request->wantsJson()) {
22 22
                 return response('Unauthorized.', 401);
23
-            } else {
23
+            }
24
+            else {
24 25
                 return redirect()->guest('login');
25 26
             }
26 27
         }
Please login to merge, or discard this patch.
app/Models/DbConfig.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,8 @@
 block discarded – undo
102 102
             } catch(\Exception $e) {
103 103
                 if(starts_with($e->getMessage(), 'unserialize():')) {
104 104
                     return $value;
105
-                } else {
105
+                }
106
+                else {
106 107
                     throw $e;
107 108
                 }
108 109
             }
Please login to merge, or discard this patch.
app/Http/Controllers/SettingsController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,8 @@
 block discarded – undo
76 76
         if ($type == 'settings-value') {
77 77
             Settings::set($key, Input::get('value'));
78 78
             return response('OK', 200);
79
-        } elseif ($type == 'settings-array') {
79
+        }
80
+        elseif ($type == 'settings-array') {
80 81
             $new = Input::get('value');
81 82
             $current = Settings::get($key);
82 83
 
Please login to merge, or discard this patch.
app/Data/RRDXport.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,8 @@
 block discarded – undo
64 64
 
65 65
         if ($format == 'json') {
66 66
             return $this->jsonSerialize();
67
-        } elseif ($format == 'csv') {
67
+        }
68
+        elseif ($format == 'csv') {
68 69
             return $this->csvSerialize();
69 70
         }
70 71
         return null;  // shouldn't get here
Please login to merge, or discard this patch.
app/Http/Controllers/Widgets/WidgetDataController.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@  discard block
 block discarded – undo
52 52
         if ($request->device_id) {
53 53
             return $EventlogDataTable->forDevice($request->device_id)
54 54
                 ->render('widgets.eventlog', compact(['tableName', 'action']));
55
-        } else {
55
+        }
56
+        else {
56 57
             return $EventlogDataTable->render('widgets.eventlog', compact(['tableName', 'action']));
57 58
         }
58 59
     }
@@ -95,7 +96,8 @@  discard block
 block discarded – undo
95 96
         $uptime = Settings::get('uptime_warning', 84600);
96 97
         if ($request->user()->hasGlobalRead()) {
97 98
             $devices = Device::where('ignore', '=', 0)->get();
98
-        } else {
99
+        }
100
+        else {
99 101
             $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get();
100 102
         }
101 103
         $count = ['warn' => 0, 'up' => 0, 'down' => 0];
@@ -103,10 +105,12 @@  discard block
 block discarded – undo
103 105
             if ($device->status == 1) {
104 106
                 if (($device->uptime < $uptime) && ($device->uptime != '0')) {
105 107
                     $count['warn']++;
106
-                } else {
108
+                }
109
+                else {
107 110
                     $count['up']++;
108 111
                 }
109
-            } else {
112
+            }
113
+            else {
110 114
                 $count['down']++;
111 115
             }
112 116
         }
@@ -137,7 +141,8 @@  discard block
 block discarded – undo
137 141
             $count['ports']['down'] = Port::isDown()->count();
138 142
             $count['ports']['ignored'] = Port::isIgnored()->count();
139 143
             $count['ports']['disabled'] = Port::isDisabled()->count();
140
-        } else {
144
+        }
145
+        else {
141 146
             $user = User::find($request->user()->user_id);
142 147
 
143 148
             $count['devices']['total'] = $user->devices()->count();
Please login to merge, or discard this patch.
app/Api/Controllers/DashboardController.php 1 patch
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -67,10 +67,12 @@  discard block
 block discarded – undo
67 67
                     }
68 68
                 }
69 69
                 return $this->response->array(array('statusText' => 'OK', 'dashboard_id' => $dashboard->dashboard_id));
70
-            } else {
70
+            }
71
+            else {
71 72
                 return $this->response->errorInternal();
72 73
             }
73
-        } else {
74
+        }
75
+        else {
74 76
             $errors = $validation->errors();
75 77
             return response()->json($errors, 422);
76 78
         }
@@ -120,10 +122,12 @@  discard block
 block discarded – undo
120 122
             $dashboard->access         = $request->access;
121 123
             if ($dashboard->save()) {
122 124
                 return $this->response->array(array('statusText' => 'OK'));
123
-            } else {
125
+            }
126
+            else {
124 127
                 return $this->response->errorInternal();
125 128
             }
126
-        } else {
129
+        }
130
+        else {
127 131
             $errors = $validation->errors();
128 132
             return response()->json($errors, 422);
129 133
         }
@@ -140,10 +144,12 @@  discard block
 block discarded – undo
140 144
         if (Dashboard::where('user_id', $request->user()->user_id)->where('dashboard_id', $id)->delete()) {
141 145
             if (UsersWidgets::where('dashboard_id', $id)->delete() >= 0) {
142 146
                 return $this->response->array(array('statusText' => 'OK'));
143
-            } else {
147
+            }
148
+            else {
144 149
                 return $this->response->errorInternal();
145 150
             }
146
-        } else {
151
+        }
152
+        else {
147 153
             return $this->response->errorInternal();
148 154
         }
149 155
     }
@@ -152,7 +158,8 @@  discard block
 block discarded – undo
152 158
     {
153 159
         if (Dashboard::find($id)->widgets()->delete() >= 0) {
154 160
             return $this->response->array(array('statusText' => 'OK'));
155
-        } else {
161
+        }
162
+        else {
156 163
             return $this->response->errorInternal();
157 164
         }
158 165
     }
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
     {
24 24
         if ($type === 'archive') {
25 25
             $notifications = Notification::isArchived($request->user())->get();
26
-        } else {
26
+        }
27
+        else {
27 28
             $notifications = Notification::isUnread()->get();
28 29
         }
29 30
         return $this->response->collection($notifications, NotificationTransformer::class);
@@ -39,13 +40,15 @@  discard block
 block discarded – undo
39 40
 
40 41
         if ($action == 'read') {
41 42
             $result = $notification->markRead($enable);
42
-        } elseif ($action == 'sticky') {
43
+        }
44
+        elseif ($action == 'sticky') {
43 45
             $result = $notification->markSticky(false);
44 46
         }
45 47
 
46 48
         if ($result === false) {
47 49
             return $this->response->errorInternal();
48
-        } else {
50
+        }
51
+        else {
49 52
             return $this->response->array(array('statusText' => 'OK'));
50 53
         }
51 54
     }
@@ -64,7 +67,8 @@  discard block
 block discarded – undo
64 67
         $notification->source = $request->user()->user_id;
65 68
         if ($notification->save()) {
66 69
             return $this->response->array(array('statusText' => 'OK'));
67
-        } else {
70
+        }
71
+        else {
68 72
             return $this->response->errorInternal();
69 73
         }
70 74
     }
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
         $per_page = $request->per_page ?: 25;
24 24
         if ($request->user()->hasGlobalRead()) {
25 25
             $devices = Device::paginate($per_page);
26
-        } else {
26
+        }
27
+        else {
27 28
             $devices = User::find($request->user()->user_id)->devices()->paginate($per_page);
28 29
         }
29 30
         return $devices;
@@ -60,7 +61,8 @@  discard block
 block discarded – undo
60 61
     {
61 62
         if ($request->user()->hasGlobalRead()) {
62 63
             $device = Device::find($id);
63
-        } else {
64
+        }
65
+        else {
64 66
             $user = User::find($request->user()->user_id);
65 67
             $device = $user->devices()->find($id);
66 68
         }
Please login to merge, or discard this patch.
app/Settings.php 1 patch
Braces   +18 added lines, -9 removed lines patch added patch discarded remove patch
@@ -70,16 +70,19 @@  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
-                    } else {
73
+                    }
74
+                    else {
74 75
                         // we are not at the leaf yet, add this chunk to the key and recurse
75 76
                         $this->set($key.'.'.$k, $v);
76 77
                     }
77
-                } else {
78
+                }
79
+                else {
78 80
                     // a leaf, recurse one last time
79 81
                     $this->set($k, $v);
80 82
                 }
81 83
             }
82
-        } else {
84
+        }
85
+        else {
83 86
             // make sure we can save this
84 87
             if ($this->isReadOnly($key)) {
85 88
                 throw new \Exception("The setting '".$key."' is read only");
@@ -112,14 +115,16 @@  discard block
 block discarded – undo
112 115
             if (count($db_data) == 1 && $db_data->first()->config_name == $key && $is_array !== true) {
113 116
                 // return a value if we are getting one item and it is the requested item (not recursing)
114 117
                 return $db_data->first()->config_value;
115
-            } elseif (count($db_data) >= 1) {
118
+            }
119
+            elseif (count($db_data) >= 1) {
116 120
                 // convert the collection to an array
117 121
                 $result = self::collectionToArray($db_data, $key);
118 122
 
119 123
                 // if we have config_data, merge them
120 124
                 if (isset($config_data)) {
121 125
                     return array_replace_recursive($config_data, $result);
122
-                } else {
126
+                }
127
+                else {
123 128
                     return $result;
124 129
                 }
125 130
             }
@@ -201,7 +206,8 @@  discard block
 block discarded – undo
201 206
         $count = DbConfig::key($key)->count();
202 207
         if ($count == 1) {
203 208
             $this->flush($key);
204
-        } else {
209
+        }
210
+        else {
205 211
             $this->flush(); // possible optimization: selective flush
206 212
         }
207 213
 
@@ -235,7 +241,8 @@  discard block
 block discarded – undo
235 241
         if (is_null($key)) {
236 242
             // Clear all cache
237 243
             Cache::tags(self::$cache_tag)->flush();
238
-        } else {
244
+        }
245
+        else {
239 246
             // Clear specific path
240 247
             $path = [];
241 248
             foreach (explode('.', $key) as $element) {
@@ -260,7 +267,8 @@  discard block
 block discarded – undo
260 267
             $this->forget($key);
261 268
             array_unshift($var, $value);
262 269
             $this->set($key, $var);
263
-        } else {
270
+        }
271
+        else {
264 272
             $arr = [$value];
265 273
             if (!is_null($var)) {
266 274
                 $arr[] = $var;
@@ -284,7 +292,8 @@  discard block
 block discarded – undo
284 292
         if (is_array($var)) {
285 293
             $var[] = $value;
286 294
             $this->set($key, $var);
287
-        } else {
295
+        }
296
+        else {
288 297
             $arr = array();
289 298
             if (!is_null($var)) {
290 299
                 $arr[] = $var;
Please login to merge, or discard this patch.