murrant / librenmsv2

app/DataTables/Alerting/LogsDataTable.php

Spacing +4 added lines, -4 removed lines

@@ -39,18 +39,18 @@ 
     {
         return $this->datatables
             ->eloquent($this->query())
-            ->editColumn('device.hostname', function ($log) {
+            ->editColumn('device.hostname', function($log) {
                 $hostname = is_null($log->device) ? trans('devices.text.deleted') : $log->device->hostname;
                 return '<a href="'.url("devices/".$log->device_id).'">'.$hostname.'</a>';
             })
-            ->editColumn('rule.name', function ($log) {
+            ->editColumn('rule.name', function($log) {
                 if ($log->rule_id) {
                     return '<a href="'.url("alerting/rules/".$log->rule_id).'">'.$log->rule->name.'</a>';
                 } else {
                     return trans('alerting.general.text.invalid');
                 }
             })
-            ->editColumn('state', function ($log) {
+            ->editColumn('state', function($log) {
                 $icon   = '';
                 $colour = '';
                 $text   = '';
@@ -77,7 +77,7 @@ 
                 }
                 return '<b><span class="fa fa-'.$icon.'" style="color:'.$colour.'"></span> '.$text.'</b>';
             })
-            ->editColumn('time_logged', function ($log) {
+            ->editColumn('time_logged', function($log) {
                 return date('Y-m-d H:i:s', $log->time_logged / 1000);
             })
             ->make(true);

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);

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/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);

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

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;
     }
 
     /**