New gravity count logic

This commit is contained in:
DL6ER
2016-12-14 13:27:10 +01:00
parent df146883b6
commit 52a2e65875
+5 -4
View File
@@ -1,14 +1,13 @@
<?php
$log = array();
$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
$divide = $setupVars['IPV6_ADDRESS'] != "" && $setupVars['IPV4_ADDRESS'] != "";
$hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
$log = new \SplFileObject('/var/log/pihole.log');
/******* Public Members ********/
function getSummaryData() {
global $log, $divide;
$domains_being_blocked = gravityCount() / ($divide ? 2 : 1);
global $log;
$domains_being_blocked = gravityCount();
$dns_queries_today = countDnsQueries();
@@ -231,7 +230,9 @@
/******** Private Members ********/
function gravityCount() {
return exec("grep -c ^ /etc/pihole/gravity.list");
$preEventHorizon = exec("grep -c ^ /etc/pihole/list.preEventHorizon");
$blacklist = exec("grep -c ^ /etc/pihole/blacklist.txt");
return ($preEventHorizon + $blacklist);
}
function getDnsQueries(\SplFileObject $log) {