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

Create seperate filter for get all queries, as it was messing up the main page.

Browse Source
This commit is contained in:
Promofaux
2016-04-15 21:04:08 +01:00
parent 1028d164dc
commit 52281939eb
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data.php
View File

@@ -116,21 +116,22 @@
function getAllQueries() {
$allQueries = array("data" => array());
$log = readInLog();
$dns_queries = getDnsQueries($log);
$dns_queries = getDnsQueriesAll($log);
foreach ($dns_queries as $query) {
$time = date_create(substr($query, 0, 16));
$exploded = explode(" ", trim($query));
$tmp = $exploded[count($exploded)-4];
if (substr($exploded[count($exploded)-4], 0, 5) == "query"){
if (substr($tmp, 0, 5) == "query"){
$type = substr($exploded[count($exploded)-4], 6, -1);
$domain = $exploded[count($exploded)-3];
$client = $exploded[count($exploded)-1];
}
elseif (substr($exploded[count($exploded)-4], 0, 9) == "forwarded" ){
elseif (substr($tmp, 0, 9) == "forwarded" ){
$status="OK";
}
elseif (substr($exploded[count($exploded)-4], 0, 5) == "/etc/" ){
elseif (substr($tmp, strlen($tmp) - 12, 12) == "gravity.list" ){
$status="Pi-holed";
}
@@ -172,6 +173,9 @@
function getDnsQueries($log) {
return array_filter($log, "findQueries");
}
function getDnsQueriesAll($log) {
return array_filter($log, "findQueriesAll");
}
function getBlockedQueries($log) {
return array_filter($log, "findAds");
}
@@ -246,8 +250,12 @@
return array_reverse($recent);
}
function findQueriesAll($var) {
return strpos($var, ": query[") || strpos($var, "gravity.list") || strpos($var, ": forwarded") !== false;
}
function findQueries($var) {
return strpos($var, ": query[") || strpos($var, "gravity.list") || strpos($var, ": forwarded")!== false;
return strpos($var, ": query[") !== false;
}
function findAds($var) {