thooge/ipreg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement node flags

Browse Source
This commit is contained in:
Thomas Hooge
2023-03-07 14:56:32 +01:00
parent 78b97c5094
commit bfbdc16036
15 changed files with 200 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
subnet.php
View File

@@ -186,12 +186,12 @@ if ($action == ACT_DEFAULT):
// ========== VARIANT: default behavior =======================================
$sql = "SELECT s.subnet_id, s.subnet_address, s.subnet_mask,
s.ntp_server,
CONCAT(LEFT(s.subnet_info, 50), IF(CHAR_LENGTH(s.subnet_info)>50,'...','')) AS subnet_info,
COUNT(node.subnet_id) AS node_counter
FROM subnet AS s LEFT JOIN node USING (subnet_id)
GROUP BY s.subnet_id
ORDER BY INET_ATON(s.subnet_address)";
s.ntp_server,
CONCAT(LEFT(s.subnet_info, 50), IF(CHAR_LENGTH(s.subnet_info)>50,'...','')) AS subnet_info,
COUNT(node.subnet_id) AS node_counter
FROM subnet AS s LEFT JOIN node USING (subnet_id)
GROUP BY s.subnet_id
ORDER BY INET_ATON(s.subnet_address)";
$sth = $dbh->query($sql);
$smarty->assign("subnets", $sth->fetchAll());
@@ -215,22 +215,15 @@ if(isset($_GET['page'])) {
}
// subnet
$sql = "SELECT
s.subnet_id AS id,
s.subnet_address AS address,
s.subnet_mask AS mask,
s.subnet_dhcp_start AS dhcp_start,
s.subnet_dhcp_end AS dhcp_end,
s.subnet_info AS info,
s.protocol_version AS proto_vers,
$sql = "SELECT s.subnet_id AS id, s.subnet_address AS address, s.subnet_mask AS mask,
s.subnet_dhcp_start AS dhcp_start, s.subnet_dhcp_end AS dhcp_end,
s.subnet_info AS info, s.protocol_version AS proto_vers,
s.ntp_server,
COUNT(node.subnet_id) AS node_counter
FROM
subnet AS s LEFT JOIN node USING (subnet_id)
WHERE
s.subnet_id=?
GROUP BY
s.subnet_id";
COUNT(n.subnet_id) AS node_counter
FROM subnet AS s LEFT JOIN node AS n USING (subnet_id)
WHERE s.subnet_id=?
AND ((n.node_flags IS NULL) OR (n.node_flags & 0x1 = 0))
GROUP BY s.subnet_id";
$sth = $dbh->prepare($sql);
$sth->execute([$id]);
@@ -441,6 +434,7 @@ $sql = "SELECT
LEFT JOIN assetclass AS c USING (assetclass_id)
LEFT JOIN assetclassgroup AS g USING (assetclassgroup_id)
WHERE n.subnet_id=:subnet_id
AND ((n.node_flags IS NULL) OR (n.node_flags & 0x1 = 0))
AND INET_ATON(n.node_ip) BETWEEN :ipfrom AND :ipto";
// Debug $smarty->assign("sql",array_key_first($subnetdata) . " - " . array_key_last($subnetdata) );
$sth = $dbh->prepare($sql);
@@ -556,6 +550,7 @@ $sql = "SELECT assetclass_id AS id, assetclass_name AS name,
LEFT JOIN assetclass USING (assetclass_id)
LEFT JOIN assetclassgroup USING (assetclassgroup_id)
WHERE subnet_id=?
AND ((node.node_flags IS NULL) OR (node.node_flags & 0x1 = 0))
GROUP BY assetclass_id
ORDER BY assetclass_name";
$sth = $dbh->prepare($sql);