From 52a2e65875f90d71880b07991fc54a387ea40260 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Wed, 14 Dec 2016 13:27:10 +0100
Subject: [PATCH] New gravity count logic

---
 data.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/data.php b/data.php
index 9c91cc34..b3b9da7d 100644
--- a/data.php
+++ b/data.php
@@ -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) {