murrant / librenmsv2

app/DataTables/Alerting/AlertsDataTable.php

Spacing +4 added lines, -4 removed lines

@@ -49,14 +49,14 @@ 
                                     @else
                                         <div class="label label-default">UNKNOWN</div>
                                     @endif')
-            ->editColumn('rule.name', function ($alert) {
+            ->editColumn('rule.name', function($alert) {
                 return '<a href="'.url("alerting/rules/".$alert->rule_id).'">'.$alert->rule->name.'</a>';
             })
-            ->editColumn('device.hostname', function ($alert) {
+            ->editColumn('device.hostname', function($alert) {
                 $hostname = is_null($alert->device) ? trans('devices.text.deleted') : $alert->device->hostname;
                 return '<a href="'.url("devices/".$alert->device_id).'">'.$hostname.'</a>';
             })
-            ->addColumn('actions', function ($alert) {
+            ->addColumn('actions', function($alert) {
                 if ($alert->state == 2) {
                     $btn  = "btn-danger";
                     $icon = "volume-off";
@@ -66,7 +66,7 @@ 
                 }
                 return '<a id="alerts-ack" data-id="'.$alert->id.'" data-state="'.$alert->state.'" class="btn btn-xs '.$btn.'"><i class="fa fa-'.$icon.' fa-fw"></i></a>';
             })
-            ->editColumn('rule.severity', function ($alert) {
+            ->editColumn('rule.severity', function($alert) {
                 return $alert->rule->severity;
             })
             ->make(true);

Braces +2 added lines, -1 removed lines

@@ -60,7 +60,8 @@
                 if ($alert->state == 2) {
                     $btn  = "btn-danger";
                     $icon = "volume-off";
-                } else {
+                }
+                else {
                     $btn  = "btn-success";
                     $icon = "volume-up";
                 }

app/DataTables/DeviceGroupDataTable.php

Spacing +3 added lines, -3 removed lines

@@ -38,14 +38,14 @@
     {
         return $this->datatables
             ->eloquent($this->query())
-            ->editColumn('name', function ($group) {
+            ->editColumn('name', function($group) {
                 return '<a href="'.url('devices/group='.$group->id).'">'.$group->name.'</a>';
             })
-            ->editColumn('count', function ($group) {
+            ->editColumn('count', function($group) {
                 return '<span data-toggle="tooltip" title="'.$group->deviceCount.' '.trans('nav.devices.devices').'" class="badge bg-aqua">
                 <i class="fa fa-server"></i>&nbsp; '.$group->deviceCount.'</span>';
             })
-            ->addColumn('actions', function ($group) {
+            ->addColumn('actions', function($group) {
                 $edit = '<button type="button" class="btn btn-xs btn-primary showModal"  data-toggle="modal" data-target="#generalModal" data-href="'.
                     route('device-groups.edit', ['group_id' => $group->id]).
                     '"><i class="fa fa-edit fa-lg fa-fw"></i><span class="hidden-xs"> '.trans('button.edit').'</span></button> ';

app/Http/Controllers/DeviceGroupController.php

Doc Comments +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(DeviceGroupRequest $request)
     {
@@ -70,7 +70,7 @@ 
      * Display the specified resource.
      *
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id)
     {
@@ -94,7 +94,7 @@ 
      *
      * @param  \Illuminate\Http\Request $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(DeviceGroupRequest $request, $id)
     {
@@ -110,7 +110,7 @@ 
      *
      * @param \Illuminate\Http\Request $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      * @throws \Exception
      */
     public function destroy(AdminOnlyRequest $request, $id)

Braces +2 added lines, -1 removed lines

@@ -118,7 +118,8 @@
         $group = DeviceGroup::find($id);
         if ($group && $group->delete()) {
             return response()->json(['message' => trans('devices.groups.deleted', ['name' => $group->name])]);
-        } else {
+        }
+        else {
             return response()->json(['message' => trans('devices.groups.deletefailed', ['name' => $group ? $group->name : ""])], 422);
         }
     }

app/Http/Controllers/UserController.php

Doc Comments +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param CreateUserRequest $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(CreateUserRequest $request)
     {
@@ -119,7 +119,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int $user_id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeleteUserRequest $request, $user_id)
     {

Braces +2 added lines, -1 removed lines

@@ -108,7 +108,8 @@
         $user->update($request->all());
         if ($request->input('update') == 'password') {
             $message = trans('user.text.pwdupdated');
-        } else {
+        }
+        else {
             $message = trans('user.text.updated', ['username' => $user->username]);
         }
 

app/Models/DeviceGroup.php

Doc Comments +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
      * Convert a v1 device group pattern to sql that can be ingested by jQuery-QueryBuilder
      *
      * @param $pattern
-     * @return array
+     * @return string
      */
     private function convertV1Pattern($pattern)
     {

Spacing +3 added lines, -3 removed lines

@@ -172,7 +172,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);
             }
@@ -298,7 +298,7 @@ 
         $sql = $this->pattern;
 
         // fill in parameters
-        foreach ((array)$this->params as $value) {
+        foreach ((array) $this->params as $value) {
             if (!is_numeric($value) && !starts_with($value, "'")) {
                 $value = "'".$value."'";
             }
@@ -323,7 +323,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

@@ -126,7 +126,8 @@ 
                     // can't build sql
                     return [];
                 }
-            } else {
+            }
+            else {
                 $params = $this->params;
             }
         }
@@ -137,7 +138,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) {
@@ -153,7 +155,8 @@ 
         // match the device ids
         if (is_null($params)) {
             return $query->whereRaw($statement)->pluck('device_id')->toArray();
-        } else {
+        }
+        else {
             return $query->whereRaw($statement, $params)->pluck('device_id')->toArray();
         }
     }
@@ -181,7 +184,8 @@ 
         if (str_contains($pattern, 'macros.')) {
             if (++$x < 30) {
                 $pattern = self::applyGroupMacros($pattern, $x);
-            } else {
+            }
+            else {
                 return false;
             }
         }
@@ -225,7 +229,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
 
@@ -235,14 +240,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
             }
@@ -273,7 +282,8 @@ 
         // add ends appropriately
         if ($startAnchor && !$endAnchor) {
             $pattern .= '%';
-        } elseif (!$startAnchor && $endAnchor) {
+        }
+        elseif (!$startAnchor && $endAnchor) {
             $pattern = '%'.$pattern;
         }
 

app/DataTables/DeviceDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -38,33 +38,33 @@
     {
         return $this->datatables
             ->eloquent($this->query())
-            ->editColumn('status_reason', function ($device) {
+            ->editColumn('status_reason', function($device) {
                 if ($device->status == 0) {
                     return '<span data-toggle="tooltip" title="down" class="device-status label label-danger">'.$device->status_reason.'</span>';
                 } else {
                     return '<span data-toggle="tooltip" title="up" class="device-status label label-success">up</span>';
                 }
             })
-            ->editColumn('vendor', function ($device) {
+            ->editColumn('vendor', function($device) {
                 return '<img src="'.$device->icon.'" alt="'.$device->os.'">';
             })
-            ->editColumn('hostname', function ($device) {
+            ->editColumn('hostname', function($device) {
                 $hostname = is_null($device) ? trans('devices.text.deleted') : $device->hostname;
                 return '<a href="'.url("devices/".$device->device_id).'">'.$hostname.'</a>';
             })
-            ->editColumn('resources', function ($device) {
+            ->editColumn('resources', function($device) {
                 $ports   = $device->ports()->count();
                 $sensors = $device->sensors()->count();
                 return '<span data-toggle="tooltip" title="'.$ports.' Ports" class="badge bg-light-blue"><i class="fa fa-link"></i>&nbsp; '.$ports.'</span><br />
                         <span data-toggle="tooltip" title="'.$sensors.' Sensors" class="badge bg-light-blue"><i class="fa fa-dashboard"></i>&nbsp; '.$sensors.'</span>';
             })
-            ->editColumn('hardware', function ($device) {
+            ->editColumn('hardware', function($device) {
                 return $device->hardware.'<br />'.$device->features;
             })
-            ->editColumn('os', function ($device) {
+            ->editColumn('os', function($device) {
                 return ucfirst($device->os).'<br />'.$device->version;
             })
-            ->editColumn('location', function ($device) {
+            ->editColumn('location', function($device) {
                 return $device->formatUptime($device->uptime).'<br />'.$device->location;
             })
             ->make(true);

Braces +2 added lines, -1 removed lines

@@ -41,7 +41,8 @@
             ->editColumn('status_reason', function ($device) {
                 if ($device->status == 0) {
                     return '<span data-toggle="tooltip" title="down" class="device-status label label-danger">'.$device->status_reason.'</span>';
-                } else {
+                }
+                else {
                     return '<span data-toggle="tooltip" title="up" class="device-status label label-success">up</span>';
                 }
             })

app/DataTables/General/MacDataTable.php

Spacing +2 added lines, -2 removed lines

@@ -40,11 +40,11 @@
     {
         return $this->datatables
             ->eloquent($this->query())
-            ->editColumn('hostname', function ($data) {
+            ->editColumn('hostname', function($data) {
                 $hostname = is_null($data->device) ? trans('devices.text.deleted') : $data->device->hostname;
                 return '<a href="'.url("devices/".$data->device_id).'">'.$hostname.'</a>';
             })
-            ->editColumn('ifName', function ($data) {
+            ->editColumn('ifName', function($data) {
                 $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName;
                 return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>';
             })

app/DataTables/General/IPv6DataTable.php

Spacing +2 added lines, -2 removed lines

@@ -40,11 +40,11 @@
     {
         return $this->datatables
             ->eloquent($this->query())
-            ->editColumn('hostname', function ($data) {
+            ->editColumn('hostname', function($data) {
                 $hostname = is_null($data->device) ? trans('devices.text.deleted') : $data->device->hostname;
                 return '<a href="'.url("devices/".$data->device_id).'">'.$hostname.'</a>';
             })
-            ->editColumn('ifName', function ($data) {
+            ->editColumn('ifName', function($data) {
                 $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName;
                 return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>';
             })

app/Http/Middleware/AdminOnly.php

Braces +2 added lines, -1 removed lines

@@ -19,7 +19,8 @@
         if (!Auth::guard($guard)->user()->isAdmin()) {
             if ($request->ajax() || $request->wantsJson()) {
                 return response(trans('general.text.unauthorized'), 401);
-            } else {
+            }
+            else {
                 //FIXME: Errors not working
                 return redirect('/')->withErrors(['msg', trans('general.text.unauthorized')]);
             }