murrant / librenmsv2

app/Models/DeviceGroup.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,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);
             }
@@ -260,7 +260,7 @@ 
         $related = $this->getRelation('deviceCountRelation')->first();
 
         // then return the count directly
-        return ($related) ? (int)$related->count : 0;
+        return ($related) ? (int) $related->count : 0;
     }
 
     /**

Braces +16 added lines, -8 removed lines

@@ -97,7 +97,8 @@ 
         $query = null;
         if (count($tables) == 1) {
             $query = DB::table($tables[0])->select('device_id')->distinct();
-        } else {
+        }
+        else {
             $query = DB::table('devices')->select('devices.device_id')->distinct();
 
             foreach ($tables as $table) {
@@ -136,7 +137,8 @@ 
             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
 
@@ -147,14 +149,18 @@ 
 
                 $out .= "LIKE('".$this->convertRegexToLike($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
             }
@@ -185,7 +191,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 
@@ -220,7 +227,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }