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

GUI improvements and new assetclass description

Browse Source
This commit is contained in:
Thomas Hooge
2023-03-02 18:58:04 +01:00
parent 6a5c483c42
commit 6ebaea2d45
27 changed files with 127 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
search.php
View File

@@ -28,11 +28,13 @@ $needle = '%' . $search . '%';
$resultcounter = 0;
// asset
$sql = "SELECT asset_id AS id, asset_name AS name, asset_info AS description
FROM asset
WHERE asset_name LIKE :needle OR asset_hostname LIKE :needle
OR asset_info LIKE :needle
ORDER BY asset_name";
$sql = "SELECT a.asset_id AS id, a.asset_name AS name,
CONCAT(LEFT(asset_info, 50), IF(CHAR_LENGTH(asset_info)>50,'...','')) AS description,
c.assetclass_name AS assetclass
FROM asset AS a LEFT JOIN assetclass AS c USING (assetclass_id)
WHERE a.asset_name LIKE :needle OR a.asset_hostname LIKE :needle
OR a.asset_info LIKE :needle
ORDER BY a.asset_name";
$sth = $dbh->prepare($sql);
$sth->execute(['needle' => $needle]);
@@ -53,7 +55,8 @@ $resultcounter += count($locations);
$smarty->assign("locations", $locations);
// node
$sql = "SELECT node_id AS id, node_ip AS ip
$sql = "SELECT node_id AS id, node_ip AS ip,
CONCAT(LEFT(node_info, 30), IF(CHAR_LENGTH(node_info)>30,'...','')) AS info
FROM node
WHERE node_ip LIKE :needle OR node_mac LIKE :needle
OR node_dns1 LIKE :needle OR node_dns2 LIKE :needle