From 0a9a55fe3a6de7855f1171679730f2836e4da4c6 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 13:07:36 +0100
Subject: [PATCH 1/4] Improve speed of getSummaryData()

---
 data.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/data.php b/data.php
index c3e15511..d0d4d6e9 100644
--- a/data.php
+++ b/data.php
@@ -9,7 +9,7 @@
         global $log, $divide;
         $domains_being_blocked = gravityCount() / ($divide ? 2 : 1);
 
-        $dns_queries_today = count(getDnsQueries($log));
+        $dns_queries_today = countDnsQueries();
 
         $ads_blocked_today = count(getBlockedQueries($log));
 
@@ -183,6 +183,7 @@
         return $swallowed;
 
     }
+
     function getDnsQueries(\SplFileObject $log) {
         $log->rewind();
         $lines = [];
@@ -193,6 +194,11 @@
         }
         return $lines;
     }
+
+    function countDnsQueries() {
+        return exec("grep -c \": query\\[\" /var/log/pihole.log");
+    }
+
     function getDnsQueriesAll(\SplFileObject $log) {
         $log->rewind();
         $lines = [];
@@ -203,6 +209,7 @@
         }
         return $lines;
     }
+
     function getBlockedQueries(\SplFileObject $log) {
         $log->rewind();
         $lines = [];
@@ -222,6 +229,7 @@
         }
         return $lines;
     }
+
     function getForwards(\SplFileObject $log) {
         $log->rewind();
         $lines = [];

From 6b1d6d19ac478c91ff8206014c744adab9fb2dcf Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 13:30:24 +0100
Subject: [PATCH 2/4] Add function countBlockedQueries()

---
 data.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/data.php b/data.php
index d0d4d6e9..f57cf200 100644
--- a/data.php
+++ b/data.php
@@ -11,7 +11,7 @@
 
         $dns_queries_today = countDnsQueries();
 
-        $ads_blocked_today = count(getBlockedQueries($log));
+        $ads_blocked_today = countBlockedQueries();
 
         $ads_percentage_today = $dns_queries_today > 0 ? ($ads_blocked_today / $dns_queries_today * 100) : 0;
 
@@ -230,6 +230,11 @@
         return $lines;
     }
 
+    function countBlockedQueries() {
+        $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
+        return exec("grep \"gravity.list\" /var/log/pihole.log | grep -v \"pi.hole\" | grep -v -c \"".$hostname."\"");
+    }
+
     function getForwards(\SplFileObject $log) {
         $log->rewind();
         $lines = [];

From bc8ac73cfa20e43a651bce5885a96e84056bd123 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 13:40:56 +0100
Subject: [PATCH 3/4] Made gravityCount() faster

---
 data.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/data.php b/data.php
index f57cf200..633473f7 100644
--- a/data.php
+++ b/data.php
@@ -175,13 +175,7 @@
 
     /******** Private Members ********/
     function gravityCount() {
-        //returns count of domains in blocklist.
-        $NGC4889 = new \SplFileObject('/etc/pihole/gravity.list');
-        $NGC4889->seek($NGC4889->getSize());
-        $swallowed = $NGC4889->key();
-
-        return $swallowed;
-
+        return exec("grep -c ^ /etc/pihole/gravity.list");
     }
 
     function getDnsQueries(\SplFileObject $log) {

From 9179a20fa25b72636eee18120f7e78af7f1ded51 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Tue, 6 Dec 2016 08:39:24 +0100
Subject: [PATCH 4/4] Don't show " read "

---
 data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data.php b/data.php
index 633473f7..916818a6 100644
--- a/data.php
+++ b/data.php
@@ -226,7 +226,7 @@
 
     function countBlockedQueries() {
         $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
-        return exec("grep \"gravity.list\" /var/log/pihole.log | grep -v \"pi.hole\" | grep -v -c \"".$hostname."\"");
+        return exec("grep \"gravity.list\" /var/log/pihole.log | grep -v \"pi.hole\" | grep -v \" read \" | grep -v -c \"".$hostname."\"");
     }
 
     function getForwards(\SplFileObject $log) {