Completed
Push — psr2 ( 2a8f2d...cd4dd9 )
by Tony
02:56
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/Http/Controllers/DeviceGroupController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -195,7 +195,8 @@
 block discarded – undo
195 195
         $user = \Auth::user();
196 196
         if (!is_null($user) && $user->isAdmin()) {
197 197
             return false;
198
-        } else {
198
+        }
199
+        else {
199 200
             return 'auth';
200 201
         }
201 202
     }
Please login to merge, or discard this patch.
app/Models/DeviceGroup.php 1 patch
Braces   +20 added lines, -10 removed lines patch added patch discarded remove patch
@@ -123,7 +123,8 @@  discard block
 block discarded – undo
123 123
                     // can't build sql
124 124
                     return [];
125 125
                 }
126
-            } else {
126
+            }
127
+            else {
127 128
                 $params = $this->params;
128 129
             }
129 130
         }
@@ -134,7 +135,8 @@  discard block
 block discarded – undo
134 135
         $query = null;
135 136
         if (count($tables) == 1) {
136 137
             $query = DB::table($tables[0])->select('device_id')->distinct();
137
-        } else {
138
+        }
139
+        else {
138 140
             $query = DB::table('devices')->select('devices.device_id')->distinct();
139 141
 
140 142
             foreach ($tables as $table) {
@@ -150,7 +152,8 @@  discard block
 block discarded – undo
150 152
         // match the device ids
151 153
         if (is_null($params)) {
152 154
             return $query->whereRaw($statement)->pluck('device_id');
153
-        } else {
155
+        }
156
+        else {
154 157
             return $query->whereRaw($statement, $params)->pluck('device_id');
155 158
         }
156 159
     }
@@ -178,7 +181,8 @@  discard block
 block discarded – undo
178 181
         if (str_contains($pattern, 'macros.')) {
179 182
             if (++$x < 30) {
180 183
                 $pattern = self::applyGroupMacros($pattern, $x);
181
-            } else {
184
+            }
185
+            else {
182 186
                 return false;
183 187
             }
184 188
         }
@@ -309,7 +313,8 @@  discard block
 block discarded – undo
309 313
             if (starts_with($cur, '%')) {
310 314
                 // table and column or macro
311 315
                 $out .= substr($cur, 1).' ';
312
-            } elseif (substr($cur, -1) == '~') {
316
+            }
317
+            elseif (substr($cur, -1) == '~') {
313 318
                 // like operator
314 319
                 $content = $parts[++$i]; // grab the content so we can format it
315 320
 
@@ -320,14 +325,18 @@  discard block
 block discarded – undo
320 325
 
321 326
                 $out .= "LIKE('".$this->convertRegexToLike($content)."') ";
322 327
 
323
-            } elseif ($cur == '&&') {
328
+            }
329
+            elseif ($cur == '&&') {
324 330
                 $out .= 'AND ';
325
-            } elseif ($cur == '||') {
331
+            }
332
+            elseif ($cur == '||') {
326 333
                 $out .= 'OR ';
327
-            } elseif (in_array($cur, $ops)) {
334
+            }
335
+            elseif (in_array($cur, $ops)) {
328 336
                 // pass-through operators
329 337
                 $out .= $cur.' ';
330
-            } else {
338
+            }
339
+            else {
331 340
                 // user supplied input
332 341
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
333 342
             }
@@ -360,7 +369,8 @@  discard block
 block discarded – undo
360 369
         // add ends appropriately
361 370
         if ($startAnchor && !$endAnchor) {
362 371
             $pattern .= '%';
363
-        } elseif (!$startAnchor && $endAnchor) {
372
+        }
373
+        elseif (!$startAnchor && $endAnchor) {
364 374
             $pattern = '%'.$pattern;
365 375
         }
366 376
 
Please login to merge, or discard this patch.
app/DataTables/General/EventlogDataTable.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -195,7 +195,8 @@
 block discarded – undo
195 195
         $user = \Auth::user();
196 196
         if (!is_null($user) && $user->isAdmin()) {
197 197
             return false;
198
-        } else {
198
+        }
199
+        else {
199 200
             return 'auth';
200 201
         }
201 202
     }
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/Graphs/Graph.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@  discard block
 block discarded – undo
52 52
         $this->request = $request;
53 53
         if (is_null($input)) {
54 54
             $this->input = json_decode($request->{'input'});
55
-        } else {
55
+        }
56
+        else {
56 57
             $this->input = $input;
57 58
         }
58 59
         $this->device = $this->fetchDevice();
@@ -72,10 +73,12 @@  discard block
 block discarded – undo
72 73
         if ($sourceName === 'rrd') {
73 74
             if ($format == 'png') {
74 75
                 $source = $this->createRRDGraph();
75
-            } else {
76
+            }
77
+            else {
76 78
                 $source = $this->createRRDXport();
77 79
             }
78
-        } else {
80
+        }
81
+        else {
79 82
             throw new UnknownDataSourceException("Source type $source is not supported");
80 83
         }
81 84
 
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.