@@ -52,7 +52,7 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | public function query() |
| 54 | 54 | { |
| 55 | - $syslog = Syslog::with(['device' => function ($query) { |
|
| 55 | + $syslog = Syslog::with(['device' => function($query) { |
|
| 56 | 56 | return $query->addSelect(['device_id', 'hostname']); |
| 57 | 57 | }])->select('syslog.*'); |
| 58 | 58 | return $this->applyScopes($syslog); |
@@ -41,21 +41,21 @@ |
||
| 41 | 41 | { |
| 42 | 42 | return $this->datatables |
| 43 | 43 | ->eloquent($this->query()) |
| 44 | - ->editColumn('hostname', function ($data) { |
|
| 44 | + ->editColumn('hostname', function($data) { |
|
| 45 | 45 | $hostname = is_null($data->device) ? trans('devices.text.deleted') : $data->device->hostname; |
| 46 | 46 | return '<a href="'.url("devices/".$data->device_id).'">'.$hostname.'</a>'; |
| 47 | 47 | }) |
| 48 | - ->editColumn('ifName', function ($data) { |
|
| 48 | + ->editColumn('ifName', function($data) { |
|
| 49 | 49 | $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName; |
| 50 | 50 | return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>'; |
| 51 | 51 | }) |
| 52 | - ->addColumn('remote_device', function ($data) { |
|
| 52 | + ->addColumn('remote_device', function($data) { |
|
| 53 | 53 | $remote_device = IPv4::where('ipv4_addresses.ipv4_address', $data->ipv4_address)->with('port.device')->first(); |
| 54 | 54 | $remote_id = empty($remote_device->port->device->device_id) ? '' : $remote_device->port->device->device_id; |
| 55 | 55 | $remote_hostname = empty($remote_device->port->device->hostname) ? '' : $remote_device->port->device->hostname; |
| 56 | 56 | return '<a href="'.url("devices/".$remote_id).'">'.$remote_hostname.'</a>'; |
| 57 | 57 | }) |
| 58 | - ->addColumn('remote_interface', function ($data) { |
|
| 58 | + ->addColumn('remote_interface', function($data) { |
|
| 59 | 59 | $remote_device = IPv4::where('ipv4_addresses.ipv4_address', $data->ipv4_address)->with('port.device')->first(); |
| 60 | 60 | $remote_id = empty($remote_device->port->device->device_id) ? '' : $remote_device->port->device->device_id; |
| 61 | 61 | $remote_port_id = empty($remote_device->port->port_id) ? '' : $remote_device->port->port_id; |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | { |
| 40 | 40 | return $this->datatables |
| 41 | 41 | ->eloquent($this->query()) |
| 42 | - ->editColumn('level', function ($user) { |
|
| 42 | + ->editColumn('level', function($user) { |
|
| 43 | 43 | return trans('user.level.'.$user->level); |
| 44 | 44 | }) |
| 45 | 45 | ->editColumn('actions', 'datatables.user.actions') |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | return $this->datatables |
| 42 | 42 | ->eloquent($this->query()) |
| 43 | 43 | ->editColumn('hostname', 'datatables.generic.hostname') |
| 44 | - ->editColumn('ifName', function ($data) { |
|
| 44 | + ->editColumn('ifName', function($data) { |
|
| 45 | 45 | $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName; |
| 46 | 46 | return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>'; |
| 47 | 47 | }) |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $eventlogs = Device::find($this->device_id)->eventlogs()->select('eventlog.*'); |
| 61 | 61 | } else { |
| 62 | 62 | $eventlogs = Eventlog::with([ |
| 63 | - 'device' => function ($query) { |
|
| 63 | + 'device' => function($query) { |
|
| 64 | 64 | return $query->addSelect(['device_id', 'hostname']); |
| 65 | 65 | }, |
| 66 | 66 | ])->select('eventlog.*'); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function getAjax() |
| 124 | 124 | { |
| 125 | - return url('eventlog?device_id=' . $this->device_id); |
|
| 125 | + return url('eventlog?device_id='.$this->device_id); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public function forDevice($device_id) |
@@ -58,7 +58,8 @@ |
||
| 58 | 58 | if (is_numeric($this->device_id)) { |
| 59 | 59 | // eventlogs for a single device |
| 60 | 60 | $eventlogs = Device::find($this->device_id)->eventlogs()->select('eventlog.*'); |
| 61 | - } else { |
|
| 61 | + } |
|
| 62 | + else { |
|
| 62 | 63 | $eventlogs = Eventlog::with([ |
| 63 | 64 | 'device' => function ($query) { |
| 64 | 65 | return $query->addSelect(['device_id', 'hostname']); |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | public function query() |
| 53 | 53 | { |
| 54 | 54 | $inventory = Inventory::with([ |
| 55 | - 'device' => function ($query) { |
|
| 55 | + 'device' => function($query) { |
|
| 56 | 56 | return $query->addSelect(['device_id', 'hostname']); |
| 57 | 57 | }, |
| 58 | 58 | ])->select('entPhysical.*'); |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | return $this->datatables |
| 42 | 42 | ->eloquent($this->query()) |
| 43 | 43 | ->editColumn('hostname', 'datatables.generic.hostname') |
| 44 | - ->editColumn('ifName', function ($data) { |
|
| 44 | + ->editColumn('ifName', function($data) { |
|
| 45 | 45 | $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName; |
| 46 | 46 | return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>'; |
| 47 | 47 | }) |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | return $this->datatables |
| 42 | 42 | ->eloquent($this->query()) |
| 43 | 43 | ->editColumn('hostname', 'datatables.generic.hostname') |
| 44 | - ->editColumn('ifName', function ($data) { |
|
| 44 | + ->editColumn('ifName', function($data) { |
|
| 45 | 45 | $ifName = is_null($data->ifName) ? trans('devices.text.deleted') : $data->ifName; |
| 46 | 46 | return '<a href="'.url("devices/".$data->device_id."/ports/".$data->port_id).'">'.$ifName.'</a>'; |
| 47 | 47 | }) |
@@ -28,7 +28,8 @@ |
||
| 28 | 28 | |
| 29 | 29 | if ($db_driver == 'SQLITE') { |
| 30 | 30 | $db_version = collect(DB::select('SELECT sqlite_version() AS version'))->pluck('version')->first(); |
| 31 | - } else { |
|
| 31 | + } |
|
| 32 | + else { |
|
| 32 | 33 | $db_version = collect(DB::select('SELECT version() AS version'))->pluck('version')->first(); |
| 33 | 34 | } |
| 34 | 35 | |