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

Take into account the whitelist and blacklist

Browse Source
This commit is contained in:
Mcat12
2016-12-20 13:11:15 -05:00
parent 472833cdbd
commit 4b7f20cfae
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.php
+16 -7
View File
@@ -5,6 +5,8 @@
$hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
$log = new \SplFileObject('/var/log/pihole.log');
$gravity = new \SplFileObject('/etc/pihole/list.preEventHorizon');
$whitelist = new \SplFileObject('/etc/pihole/whitelist.txt');
$blacklist = new \SplFileObject('/etc/pihole/blacklist.txt');
/******* Public Members ********/
function getSummaryData() {
@@ -183,10 +185,15 @@
}
function getAllQueries($orderBy) {
global $log,$gravity,$showBlocked,$showPermitted;
global $log,$gravity,$showBlocked,$showPermitted,$whitelist,$blacklist;
$allQueries = array("data" => array());
$dns_queries = getDnsQueriesAll($log);
$gravity_domains = getGravityDomains($gravity);
$gravity_domains = getDomains($gravity, true);
$whitelist_domains = getDomains($whitelist, false);
$blacklist_domains = getDomains($blacklist, true);
$gravity_domains = array_merge($gravity_domains, $whitelist_domains, $blacklist_domains);
foreach ($dns_queries as $query) {
$time = date_create(substr($query, 0, 16));
@@ -198,7 +205,9 @@
if (substr($tmp, 0, 5) == "query")
{
$status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK";
$status = isset($gravity_domains[$domain]) ?
$gravity_domains[$domain] === true ? "Pi-holed" : "OK"
: "OK";
if(($status === "Pi-holed" && $showBlocked) || ($status === "OK" && $showPermitted))
{
$type = substr($exploded[count($exploded)-4], 6, -1);
@@ -265,13 +274,13 @@
return $lines;
}
function getGravityDomains($gravity){
$gravity->rewind();
function getDomains($file, $default_value){
$file->rewind();
$lines=[];
foreach ($gravity as $line) {
foreach ($file as $line) {
// Strip newline (and possibly carriage return) from end of string
// using rtrim()
$lines[rtrim($line)] = true;
$lines[rtrim($line)] = $default_value;
}
return $lines;