Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-21 09:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also show IP addresses in MAC details

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-14 20:13:49 +02:00
parent fe10059517
commit 8a794bf9aa
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/pi-hole/php/groups.php
View File

@@ -218,12 +218,24 @@ if ($_POST['action'] == 'get_groups') {
$ips = array();
while ($res = $query->fetchArray(SQLITE3_ASSOC)) {
$id = intval($res["id"]);
// Get associated host names
$query_names = $FTLdb->query("SELECT name FROM network_names WHERE network_id = $id ORDER BY lastSeen DESC;");
$names = [];
while ($res_names = $query_names->fetchArray(SQLITE3_ASSOC)) {
array_push($names, utf8_encode($res_names["name"]));
}
$query_names->finalize();
// Get associated IP addresses
$query_ips = $FTLdb->query("SELECT ip FROM network_addresses WHERE network_id = $id ORDER BY lastSeen DESC;");
$addresses = [];
while ($res_ips = $query_ips->fetchArray(SQLITE3_ASSOC)) {
array_push($addresses, utf8_encode($res_ips["ip"]));
}
$query_ips->finalize();
// Prepare extra information
$extrainfo = "";
// Add device vendor to info string (if available)
if (strlen($res["macVendor"]) > 0) {
@@ -236,6 +248,16 @@ if ($_POST['action'] == 'get_groups') {
$extrainfo .= "hostname: ".$names[0];
else if(count($names) > 0)
$extrainfo .= "hostnames: ".implode(", ", $names);
if (count($names) > 0 && count($addresses) > 0)
$extrainfo .= ", ";
// Add list of associated host names to info string (if available)
if(count($addresses) === 1)
$extrainfo .= "address: ".$addresses[0];
else if(count($addresses) > 0)
$extrainfo .= "addresses: ".implode(", ", $addresses);
$ips[strtoupper($res['hwaddr'])] = $extrainfo;
}
$FTLdb->close();