Completed
Pull Request — develop (#143)
by Tony
03:52
created
app/Http/Controllers/General/SearchController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
 
26 26
 namespace App\Http\Controllers\General;
27 27
 
28
+use App\DataTables\General\ArpDataTable;
28 29
 use App\DataTables\General\IPv4DataTable;
29 30
 use App\DataTables\General\IPv6DataTable;
30 31
 use App\DataTables\General\MacDataTable;
31
-use App\DataTables\General\ArpDataTable;
32 32
 use App\Http\Controllers\Controller;
33 33
 use Illuminate\Http\Request;
34 34
 
Please login to merge, or discard this patch.
app/Http/Controllers/Widgets/WidgetDataController.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -82,7 +82,8 @@  discard block
 block discarded – undo
82 82
         $uptime = Settings::get('uptime_warning', 84600);
83 83
         if ($request->user()->hasGlobalRead()) {
84 84
             $devices = Device::where('ignore', '=', 0)->get();
85
-        } else {
85
+        }
86
+        else {
86 87
             $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get();
87 88
         }
88 89
         $count = ['warn' => 0, 'up' => 0, 'down' => 0];
@@ -90,10 +91,12 @@  discard block
 block discarded – undo
90 91
             if ($device->status == 1) {
91 92
                 if (($device->uptime < $uptime) && ($device->uptime != '0')) {
92 93
                     $count['warn']++;
93
-                } else {
94
+                }
95
+                else {
94 96
                     $count['up']++;
95 97
                 }
96
-            } else {
98
+            }
99
+            else {
97 100
                 $count['down']++;
98 101
             }
99 102
         }
@@ -122,7 +125,8 @@  discard block
 block discarded – undo
122 125
             $count['ports']['down'] = Port::isDown()->count();
123 126
             $count['ports']['ignored'] = Port::isIgnored()->count();
124 127
             $count['ports']['disabled'] = Port::isDisabled()->count();
125
-        } else {
128
+        }
129
+        else {
126 130
             $user = User::find($request->user()->user_id);
127 131
 
128 132
             $count['devices']['total'] = $user->devices()->count();
Please login to merge, or discard this patch.
app/DataTables/DeviceDataTable.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,6 @@
 block discarded – undo
25 25
 
26 26
 namespace App\DataTables;
27 27
 
28
-use App\Models\DeviceGroup;
29 28
 use App\Models\Device;
30 29
 
31 30
 class DeviceDataTable extends BaseDataTable
Please login to merge, or discard this patch.
app/Http/Controllers/DeviceController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace App\Http\Controllers;
4 4
 
5 5
 use App\DataTables\DeviceDataTable;
6
-use App\DataTables\DeviceGroupDataTable;
7 6
 use App\Models\DeviceGroup;
8 7
 use Dingo\Api\Http;
9 8
 use Dingo\Api\Routing\Helpers;
Please login to merge, or discard this patch.
app/Http/Controllers/DeviceGroupController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace App\Api\Controllers;
4 4
 
5 5
 use DB;
6
-use App\Http\Requests;
7 6
 use Illuminate\Http\Request;
8 7
 
9 8
 class ApiController extends Controller
Please login to merge, or discard this 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   +16 added lines, -8 removed lines patch added patch discarded remove patch
@@ -145,7 +145,8 @@  discard block
 block discarded – undo
145 145
         $query = null;
146 146
         if (count($tables) == 1) {
147 147
             $query = DB::table($tables[0])->select('device_id')->distinct();
148
-        } else {
148
+        }
149
+        else {
149 150
             $query = DB::table('devices')->select('devices.device_id')->distinct();
150 151
 
151 152
             foreach ($tables as $table) {
@@ -185,7 +186,8 @@  discard block
 block discarded – undo
185 186
         if (str_contains($pattern, 'macros.')) {
186 187
             if (++$x < 30) {
187 188
                 $pattern = self::applyGroupMacros($pattern, $x);
188
-            } else {
189
+            }
190
+            else {
189 191
                 return false;
190 192
             }
191 193
         }
@@ -249,7 +251,8 @@  discard block
 block discarded – undo
249 251
             if (starts_with($cur, '%')) {
250 252
                 // table and column or macro
251 253
                 $out .= substr($cur, 1).' ';
252
-            } elseif (substr($cur, -1) == '~') {
254
+            }
255
+            elseif (substr($cur, -1) == '~') {
253 256
                 // like operator
254 257
                 $content = $parts[++$i]; // grab the content so we can format it
255 258
 
@@ -260,14 +263,18 @@  discard block
 block discarded – undo
260 263
 
261 264
                 $out .= "LIKE('".$this->convertRegexToLike($content)."') ";
262 265
 
263
-            } elseif ($cur == '&&') {
266
+            }
267
+            elseif ($cur == '&&') {
264 268
                 $out .= 'AND ';
265
-            } elseif ($cur == '||') {
269
+            }
270
+            elseif ($cur == '||') {
266 271
                 $out .= 'OR ';
267
-            } elseif (in_array($cur, $ops)) {
272
+            }
273
+            elseif (in_array($cur, $ops)) {
268 274
                 // pass-through operators
269 275
                 $out .= $cur.' ';
270
-            } else {
276
+            }
277
+            else {
271 278
                 // user supplied input
272 279
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
273 280
             }
@@ -300,7 +307,8 @@  discard block
 block discarded – undo
300 307
         // add ends appropriately
301 308
         if ($startAnchor && !$endAnchor) {
302 309
             $pattern .= '%';
303
-        } elseif (!$startAnchor && $endAnchor) {
310
+        }
311
+        elseif (!$startAnchor && $endAnchor) {
304 312
             $pattern = '%'.$pattern;
305 313
         }
306 314
 
Please login to merge, or discard this patch.