From bbdb675d7b4d9ecfa1397ab88cee5ed490158225 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Wed, 14 Dec 2016 10:34:13 +0100
Subject: [PATCH] Reimplement API_QUERY_LOG_SHOW actions + remove obsolete if
 statement

---
 data.php | 59 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/data.php b/data.php
index 6b3c9ded..6098be9c 100644
--- a/data.php
+++ b/data.php
@@ -189,38 +189,39 @@
             $tmp = $exploded[count($exploded)-4];
             $status = "";
 
-            if (substr($tmp, 0, 5) == "query"){
-                $type = substr($exploded[count($exploded)-4], 6, -1);
-                $domain = $exploded[count($exploded)-3];
-                $client = $exploded[count($exploded)-1];
+            if (substr($tmp, 0, 5) == "query")
+            {
                 $status = isset($gravity_domains[$domain]) ? "Pi-holed" : "OK";
-            }
+                if(($status === "Pi-holed" && $showblocked) || ($status === "OK" && $showpermitted))
+                {
+                    $type = substr($exploded[count($exploded)-4], 6, -1);
+                    $domain = $exploded[count($exploded)-3];
+                    $client = $exploded[count($exploded)-1];
 
-            if ( $status != ""){
-              if($orderBy == "orderByClientDomainTime"){
-                $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status;
-              }elseif ($orderBy == "orderByClientTimeDomain"){
-                $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status;
-              }elseif ($orderBy == "orderByTimeClientDomain"){
-                $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status;
-              }elseif ($orderBy == "orderByTimeDomainClient"){
-                $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status;
-              }elseif ($orderBy == "orderByDomainClientTime"){
-                $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status;
-              }elseif ($orderBy == "orderByDomainTimeClient"){
-                $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status;
-              }else{
-                array_push($allQueries['data'], array(
-                  $time->format('Y-m-d\TH:i:s'),
-                  $type,
-                  $domain,
-                  hasHostName($client),
-                  $status,
-                  ""
-                ));
-              }
+                    if($orderBy == "orderByClientDomainTime"){
+                      $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d\TH:i:s')] = $status;
+                    }elseif ($orderBy == "orderByClientTimeDomain"){
+                      $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status;
+                    }elseif ($orderBy == "orderByTimeClientDomain"){
+                      $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status;
+                    }elseif ($orderBy == "orderByTimeDomainClient"){
+                      $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status;
+                    }elseif ($orderBy == "orderByDomainClientTime"){
+                      $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status;
+                    }elseif ($orderBy == "orderByDomainTimeClient"){
+                      $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status;
+                    }else{
+                      array_push($allQueries['data'], array(
+                        $time->format('Y-m-d\TH:i:s'),
+                        $type,
+                        $domain,
+                        hasHostName($client),
+                        $status,
+                        ""
+                      ));
+                    }
+                }
             }
-
         }
         return $allQueries;
     }