Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 18:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we're not adding IPs for mock devices.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-14 23:58:24 +02:00
parent 66422c133b
commit 29e048824e
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,14 +227,6 @@ if ($_POST['action'] == 'get_groups') {
}
$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)
@@ -249,14 +241,25 @@ if ($_POST['action'] == 'get_groups') {
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 and if this is not a mock device)
if (stripos($res["hwaddr"], "ip-") === FALSE) {
// 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);
// 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();
if (count($names) > 0 && count($addresses) > 0)
$extrainfo .= ", ";
if(count($addresses) === 1)
$extrainfo .= "address: ".$addresses[0];
else if(count($addresses) > 0)
$extrainfo .= "addresses: ".implode(", ", $addresses);
}
$ips[strtoupper($res['hwaddr'])] = $extrainfo;
}