librenms / librenmsv2

app/Http/Controllers/DeviceGroupController.php

Braces +2 added lines, -1 removed lines

@@ -195,7 +195,8 @@
         $user = \Auth::user();
         if (!is_null($user) && $user->isAdmin()) {
             return false;
-        } else {
+        }
+        else {
             return 'auth';
         }
     }

app/Http/Controllers/DeviceController.php

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
      */
-    public function index(DeviceDataTable $dataTable, $group_id=-1)
+    public function index(DeviceDataTable $dataTable, $group_id = -1)
     {
         $group_name = "";
-        if($group_id >= 0) {
+        if ($group_id >= 0) {
             $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id));
             $group_name = DeviceGroup::find($group_id)->name;
         }

app/Models/DeviceGroup.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
         }
 
         foreach (Settings::get('alert.macros.group', []) as $macro => $value) {
-            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value);  // this might need something more complex
+            $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex
             if (!str_contains($macro, ' ')) {
                 $pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern);
             }

Braces +16 added lines, -8 removed lines

@@ -145,7 +145,8 @@ 
         $query = null;
         if (count($tables) == 1) {
             $query = DB::table($tables[0])->select('device_id');
-        } else {
+        }
+        else {
             $query = DB::table('devices')->select('devices.device_id')->distinct();
 
             foreach ($tables as $table) {
@@ -186,7 +187,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -253,14 +255,16 @@ 
             if (starts_with($cur, '%')) {
                 // table and column or macro
                 $out .= substr($cur, 1).' ';
-            } elseif (substr($cur, -1) == '~') {
+            }
+            elseif (substr($cur, -1) == '~') {
                 // like operator
                 $content = $parts[++$i]; // grab the content so we can format it
 
                 if (str_contains($content, '@')) {
                     // contains wildcard
                     $content = str_replace('@', '%', $content);
-                } else {
+                }
+                else {
                     // assume substring
                     $content = '%'.$content.'%';
                 }
@@ -272,14 +276,18 @@ 
 
                 $out .= "LIKE('".$content."') ";
 
-            } elseif ($cur == '&&') {
+            }
+            elseif ($cur == '&&') {
                 $out .= 'AND ';
-            } elseif ($cur == '||') {
+            }
+            elseif ($cur == '||') {
                 $out .= 'OR ';
-            } elseif (in_array($cur, $ops)) {
+            }
+            elseif (in_array($cur, $ops)) {
                 // pass-through operators
                 $out .= $cur.' ';
-            } else {
+            }
+            else {
                 // user supplied input
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
             }