murrant / librenmsv2

app/Http/Controllers/Widgets/WidgetDataController.php

Braces +8 added lines, -4 removed lines

@@ -82,7 +82,8 @@ 
         $uptime = Settings::get('uptime_warning', 84600);
         if ($request->user()->hasGlobalRead()) {
             $devices = Device::where('ignore', '=', 0)->get();
-        } else {
+        }
+        else {
             $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get();
         }
         $count = ['warn' => 0, 'up' => 0, 'down' => 0];
@@ -90,10 +91,12 @@ 
             if ($device->status == 1) {
                 if (($device->uptime < $uptime) && ($device->uptime != '0')) {
                     $count['warn']++;
-                } else {
+                }
+                else {
                     $count['up']++;
                 }
-            } else {
+            }
+            else {
                 $count['down']++;
             }
         }
@@ -122,7 +125,8 @@ 
             $count['ports']['down'] = Port::isDown()->count();
             $count['ports']['ignored'] = Port::isIgnored()->count();
             $count['ports']['disabled'] = Port::isDisabled()->count();
-        } else {
+        }
+        else {
             $user = User::find($request->user()->user_id);
 
             $count['devices']['total'] = $user->devices()->count();

app/Api/Controllers/DashboardWidgetController.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      */
     public function show(Request $request, $id)
     {
-        $widget  = Widgets::find($id);
+        $widget = Widgets::find($id);
         return array('widget' => $widget);
     }
 

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/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/Models/DeviceGroup.php

Spacing +3 added lines, -3 removed lines

@@ -169,7 +169,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);
             }
@@ -224,7 +224,7 @@ 
         }
 
         // fill in parameters
-        foreach ((array)$this->params as $value) {
+        foreach ((array) $this->params as $value) {
             if (!is_numeric($value) && !starts_with($value, "'")) {
                 $value = "'".$value."'";
             }
@@ -251,7 +251,7 @@ 
         $related = $this->getRelation('deviceCountRelation')->first();
 
         // then return the count directly
-        return ($related) ? (int)$related->count : 0;
+        return ($related) ? (int) $related->count : 0;
     }
 
     /**

Braces +20 added lines, -10 removed lines

@@ -123,7 +123,8 @@ 
                     // can't build sql
                     return [];
                 }
-            } else {
+            }
+            else {
                 $params = $this->params;
             }
         }
@@ -134,7 +135,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) {
@@ -150,7 +152,8 @@ 
         // match the device ids
         if (is_null($params)) {
             return $query->whereRaw($statement)->pluck('device_id');
-        } else {
+        }
+        else {
             return $query->whereRaw($statement, $params)->pluck('device_id');
         }
     }
@@ -178,7 +181,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -309,7 +313,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
 
@@ -320,14 +325,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
             }
@@ -360,7 +369,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 

app/Providers/RouteServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace' => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require base_path('routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => ['api', 'jwt-auth'],
             'namespace' => $this->namespace,
             'prefix' => 'api',
-        ], function ($router) {
+        ], function($router) {
             require base_path('routes/api.php');
         });
     }

app/Providers/BroadcastServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         /*
          * Authenticate the user's personal channel...
          */
-        Broadcast::channel('App.User.*', function ($user, $userId) {
+        Broadcast::channel('App.User.*', function($user, $userId) {
             return (int) $user->id === (int) $userId;
         });
     }