Completed
Pull Request — develop (#143)
by Tony
03:52
created
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/Http/Controllers/DeviceController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@
 block discarded – undo
18 18
      *
19 19
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
20 20
      */
21
-    public function index(DeviceDataTable $dataTable, $group_id=-1)
21
+    public function index(DeviceDataTable $dataTable, $group_id = -1)
22 22
     {
23 23
         $group_name = "";
24
-        if($group_id >= 0) {
24
+        if ($group_id >= 0) {
25 25
             $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id));
26 26
             $group_name = DeviceGroup::find($group_id)->name;
27 27
         }
Please login to merge, or discard this patch.
app/Models/DeviceGroup.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         $related = $this->getRelation('deviceCountRelation')->first();
94 94
 
95 95
         // then return the count directly
96
-        return ($related) ? (int)$related->count : 0;
96
+        return ($related) ? (int) $related->count : 0;
97 97
     }
98 98
 
99 99
     /**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
         }
177 177
 
178 178
         foreach (Settings::get('alert.macros.group', []) as $macro => $value) {
179
-            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value);  // this might need something more complex
179
+            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex
180 180
             if (!str_contains($macro, ' ')) {
181 181
                 $pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern);
182 182
             }
Please login to merge, or discard this 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.