From 57e814a5ee971ff8a7ca2f8dc40cffe5d718e513 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Fri, 9 Dec 2016 15:38:50 +0100
Subject: [PATCH 1/4] Added function excludeDomainsfromList($array)

---
 data.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/data.php b/data.php
index 916818a6..bfa18bfa 100644
--- a/data.php
+++ b/data.php
@@ -1,6 +1,7 @@
 <?php
     $log = array();
-    $divide =  parse_ini_file("/etc/pihole/setupVars.conf")['IPV6_ADDRESS'] != "" && parse_ini_file("/etc/pihole/setupVars.conf")['IPV4_ADDRESS'] != "";
+    $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');
 
@@ -254,10 +255,29 @@
                 }
             }
         }
+
+        global $setupVars;
+        if(isset($setupVars["WEBUI_EXCLUDE_DOMAINS"]))
+        {
+            $splitQueries = excludeDomainsfromList($splitQueries);
+        }
         arsort($splitQueries);
         return array_slice($splitQueries, 0, $qty);
     }
 
+    function excludeDomainsfromList($array)
+    {
+        global $setupVars;
+        $domains = explode(",",$setupVars["WEBUI_EXCLUDE_DOMAINS"]);
+        foreach ($domains as $domain) {
+            if(isset($array[$domain]))
+            {
+                unset($array[$domain]);
+            }
+        }
+        return $array;
+    }
+
     function overTime($entries) {
         $byTime = array();
         foreach ($entries as $entry) {

From 5e61c9c814488e662bdb06ee1c48b0029742f36a Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Fri, 9 Dec 2016 15:40:57 +0100
Subject: [PATCH 2/4] Generalized function

---
 data.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data.php b/data.php
index bfa18bfa..8f90e547 100644
--- a/data.php
+++ b/data.php
@@ -259,16 +259,17 @@
         global $setupVars;
         if(isset($setupVars["WEBUI_EXCLUDE_DOMAINS"]))
         {
-            $splitQueries = excludeDomainsfromList($splitQueries);
+            $splitQueries = excludeFromList($splitQueries, "WEBUI_EXCLUDE_DOMAINS");
         }
+
         arsort($splitQueries);
         return array_slice($splitQueries, 0, $qty);
     }
 
-    function excludeDomainsfromList($array)
+    function excludeFromList($array,$key)
     {
         global $setupVars;
-        $domains = explode(",",$setupVars["WEBUI_EXCLUDE_DOMAINS"]);
+        $domains = explode(",",$setupVars[$key]);
         foreach ($domains as $domain) {
             if(isset($array[$domain]))
             {

From 158704de923faa20c9abe2ba4674c3e3b43c1cbe Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Fri, 9 Dec 2016 15:42:03 +0100
Subject: [PATCH 3/4] Extended to Top Clients

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

diff --git a/data.php b/data.php
index 8f90e547..a94c007b 100644
--- a/data.php
+++ b/data.php
@@ -126,6 +126,13 @@
                 $sources[$ip] = 1;
             }
         }
+
+        global $setupVars;
+        if(isset($setupVars["WEBUI_EXCLUDE_CLIENTS"]))
+        {
+            $sources = excludeFromList($sources, "WEBUI_EXCLUDE_CLIENTS");
+        }
+
         arsort($sources);
         $sources = array_slice($sources, 0, 10);
         return Array(

From 0ac06710c1d6a5d65717766865afc09a5ba11aef Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Sun, 11 Dec 2016 19:31:57 +0100
Subject: [PATCH 4/4] Renamed variables since they do not only affect the webUI
 but the whole API

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

diff --git a/data.php b/data.php
index a94c007b..19704556 100644
--- a/data.php
+++ b/data.php
@@ -128,9 +128,9 @@
         }
 
         global $setupVars;
-        if(isset($setupVars["WEBUI_EXCLUDE_CLIENTS"]))
+        if(isset($setupVars["API_EXCLUDE_CLIENTS"]))
         {
-            $sources = excludeFromList($sources, "WEBUI_EXCLUDE_CLIENTS");
+            $sources = excludeFromList($sources, "API_EXCLUDE_CLIENTS");
         }
 
         arsort($sources);
@@ -264,9 +264,9 @@
         }
 
         global $setupVars;
-        if(isset($setupVars["WEBUI_EXCLUDE_DOMAINS"]))
+        if(isset($setupVars["API_EXCLUDE_DOMAINS"]))
         {
-            $splitQueries = excludeFromList($splitQueries, "WEBUI_EXCLUDE_DOMAINS");
+            $splitQueries = excludeFromList($splitQueries, "API_EXCLUDE_DOMAINS");
         }
 
         arsort($splitQueries);