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

Show hostname(s) first, then MAC vendor (if applicable) and then IP address(es).

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-15 00:00:36 +02:00
parent 29e048824e
commit f7647c9c6d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,18 +229,19 @@ if ($_POST['action'] == 'get_groups') {
// Prepare extra information
$extrainfo = "";
// Add device vendor to info string (if available)
if (strlen($res["macVendor"]) > 0) {
$extrainfo = "vendor: ".htmlspecialchars($res["macVendor"]);
if (count($names) > 0)
$extrainfo .= ", ";
}
// Add list of associated host names to info string (if available)
if(count($names) === 1)
$extrainfo .= "hostname: ".$names[0];
else if(count($names) > 0)
$extrainfo .= "hostnames: ".implode(", ", $names);
// Add device vendor to info string (if available)
if (strlen($res["macVendor"]) > 0) {
if (count($names) > 0)
$extrainfo .= "; ";
$extrainfo .= "vendor: ".htmlspecialchars($res["macVendor"]);
}
// 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) {
@@ -253,7 +254,7 @@ if ($_POST['action'] == 'get_groups') {
$query_ips->finalize();
if (count($names) > 0 && count($addresses) > 0)
$extrainfo .= ", ";
$extrainfo .= "; ";
if(count($addresses) === 1)
$extrainfo .= "address: ".$addresses[0];