From 7ee18746724f80036ed20d69685c3b5207de1257 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 24 Aug 2018 14:25:02 +0200
Subject: [PATCH] Optimize HTML and JS

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 db_queries.php                   | 60 +++++++++++++++-----------------
 scripts/pi-hole/js/db_queries.js |  5 ++-
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/db_queries.php b/db_queries.php
index 5c003ac1..ddb633f2 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -42,39 +42,37 @@ $token = $_SESSION['token'];
 
 <div class="row">
     <div class="col-md-12">
-        <div class="form-group">
         <label>Query status:</label>
-            <div class="row">
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_gravity" checked>Blocked (exact)</label>
-                    </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_gravity" checked>Blocked (exact)</label>
             </div>
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_forwarded" checked>OK (forwarded)</label>
-                    </div>
-                </div>
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_cached" checked>OK (cached)</label>
-                    </div>
-                </div>
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_regex" checked>Blocked (regex/wildcard)</label>
-                    </div>
-                </div>
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_blacklist" checked>Blocked (blacklist)</label>
-                    </div>
-                </div>
-                <div class="col-md-2">
-                    <div class="checkbox">
-                        <label><input type="checkbox" id="type_external" checked>Blocked (external)</label>
-                    </div>
-                </div>
+        </div>
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_forwarded" checked>OK (forwarded)</label>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_cached" checked>OK (cached)</label>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_regex" checked>Blocked (regex/wildcard)</label>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_blacklist" checked>Blocked (blacklist)</label>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="checkbox">
+                <label><input type="checkbox" id="type_external" checked>Blocked (external)</label>
             </div>
         </div>
     </div>
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index 83d61e87..ae69775d 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -168,7 +168,6 @@ function getQueryTypes()
     {
         queryType += 1 << 5;
     }
-    console.log(queryType);
     return queryType;
 }
 
@@ -209,7 +208,7 @@ function refreshTableData() {
     var APIstring = "api_db.php?getAllQueries&from="+from+"&until="+until;
     // Check if query type filtering is enabled
     var queryType = getQueryTypes();
-    if(queryType != 63) // 63 (0b00111111) = all possible query types are selected
+    if(queryType !== 63) // 63 (0b00111111) = all possible query types are selected
     {
         APIstring += "&types="+queryType;
     }
@@ -231,7 +230,7 @@ $(document).ready(function() {
     }
     // Check if query type filtering is enabled
     var queryType = getQueryTypes();
-    if(queryType != 63) // 63 (0b00111111) = all possible query types are selected
+    if(queryType !== 63) // 63 (0b00111111) = all possible query types are selected
     {
         APIstring += "&types="+queryType;
     }