pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Imporve resolveHostname() subroutine

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2018-03-05 16:48:05 +01:00
parent 57f0642c0f
commit 322b87befe
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api_db.php
+16 -9
View File
@@ -16,28 +16,35 @@ check_cors();
ini_set("max_execution_time","600");
$data = array();
$clients = [];
function resolveOnlyHostname($clientip)
$clients = array();
function resolveHostname($clientip, $printIP)
{
global $clients;
$ipaddr = strtolower($clientip);
if(array_key_exists($clientip, $clients))
{
// Entry already exists
$clientname = $clients[$clientip];
$clientname = $clients[$ipaddr];
if($printIP)
return $clientname."|".$clientip;
return $clientname;
}
if(filter_var($clientip, FILTER_VALIDATE_IP))
else if(filter_var($clientip, FILTER_VALIDATE_IP))
{
// Get host name of client and convert to lower case
$clientname = strtolower(gethostbyaddr($clientip));
$clientname = strtolower(gethostbyaddr($ipaddr));
}
else
{
// This is already a host name
$clientname = strtolower($clientip);
$clientname = $ipaddr;
}
// Buffer result
$clients[$clientname] = $clientip;
$clients[$ipaddr] = $clientname;
if($printIP)
return $clientname."|".$clientip;
return $clientname;
}
@@ -101,7 +108,7 @@ if (isset($_GET['getAllQueries']) && $auth)
if(!is_bool($results))
while ($row = $results->fetchArray())
{
$c = resolveOnlyHostname($row[3]);
$c = resolveHostname($row[3],false);
$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
}
}
@@ -136,7 +143,7 @@ if (isset($_GET['topClients']) && $auth)
while ($row = $results->fetchArray())
{
$c = resolveOnlyHostname($row[0]);
$c = resolveHostname($row[0],false);
if(array_key_exists($c, $clientnums))
{