vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

New columns: Connected devices, Location, Vendor

Browse Source
This commit is contained in:
Jokob-sk
2023-01-26 12:01:12 +11:00
parent 162d507468
commit 14cb0f46f3
6 changed files with 54 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
front/php/server/devices.php
View File

@@ -659,7 +659,9 @@ function getDevicesList() {
array("dev_LastIP_orderable", 12, 12),
array("rowid", 13, 13),
array("dev_Network_Node_MAC_ADDR", 14, 14),
array("connected_devices", 15, 15)
array("connected_devices", 15, 15),
array("dev_Location", 16, 16),
array("dev_Vendor", 17, 17)
);
if($forceDefaultOrder == FALSE)
@@ -698,24 +700,7 @@ function getDevicesList() {
FROM Devices b
WHERE b.dev_Network_Node_MAC_ADDR NOT NULL group by b.dev_Network_Node_MAC_ADDR
) t2
ON (t3.dev_MAC = t2.dev_MAC_t2);';
// $sql = 'SELECT * FROM (
// SELECT rowid, *, CASE
// WHEN t1.dev_AlertDeviceDown=1 AND t1.dev_PresentLastScan=0 THEN "Down"
// WHEN t1.dev_NewDevice=1 THEN "New"
// WHEN t1.dev_PresentLastScan=1 THEN "On-line"
// ELSE "Off-line" END AS dev_Status
// FROM Devices t1 '.$condition.') t3
// LEFT JOIN
// (
// SELECT dev_Network_Node_MAC_ADDR, dev_MAC,
// count() as connected_devices
// FROM Devices b
// WHERE b.dev_Network_Node_MAC_ADDR NOT NULL group by b.dev_Network_Node_MAC_ADDR
// ) t2
// ON (t3.dev_MAC = t2.dev_MAC);';
ON (t3.dev_MAC = t2.dev_Network_Node_MAC_ADDR_t2);';
$result = $db->query($sql);
@@ -738,8 +723,10 @@ function getDevicesList() {
formatIPlong ($row['dev_LastIP']), // IP orderable
$row['rowid'], // Rowid (hidden)
handleNull($row['dev_Network_Node_MAC_ADDR']),
handleNull($row['connected_devices']) //
);
handleNull($row['connected_devices']),
handleNull($row['dev_Location']),
handleNull($row['dev_Vendor'])
);
$newOrder = array();