From ae58c6c60ed5767e7413bf891b2e662375e6c419 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Sat, 10 Jun 2017 23:26:41 +0200
Subject: [PATCH 001/172] header.php: removed inline-stylesheet

move it to pi-hole.css
---
 scripts/pi-hole/php/header.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index cb9eecf5..79d82808 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -189,10 +189,6 @@
     <link href="style/vendor/skin-blue.min.css" rel="stylesheet" type="text/css" />
     <link href="style/pi-hole.css" rel="stylesheet" type="text/css" />
     <link rel="icon" type="image/png" sizes="160x160" href="img/logo.svg" />
-    <style type="text/css">
-        .glow { text-shadow: 0px 0px 5px #fff; }
-        h3 { transition-duration: 500ms }
-    </style>
 
     <!--[if lt IE 9]>
     <script src="scripts/vendor/html5shiv.min.js"></script>

From c9edbf3c28b090d9e77fa9e8dd6a8ef961fd1065 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Sat, 10 Jun 2017 23:32:02 +0200
Subject: [PATCH 002/172] pi-hole.css: moved small-boxes glow-effect here in *

* and improved style rule for clearer assignment
---
 style/pi-hole.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/style/pi-hole.css b/style/pi-hole.css
index 6f090058..6dc7b700 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -13,6 +13,12 @@
 	-o-user-select: none;
 	user-select: none;
 }
+.small-box h3 {
+	transition-duration: 500ms;
+}
+.small-box h3.glow {
+	text-shadow: 0px 0px 5px #fff;
+}
 .skin-blue .list-group-item:hover {
 	background: #ddd;
 }

From c867029dcb373cd5899eb7c098a837bf33934c35 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Sun, 11 Jun 2017 15:02:46 +0200
Subject: [PATCH 003/172] settings.php: remove 'lookatme'-Stylesheet

It's already an 'lookatme'-Style included in pi-hole.css, but there is a small change needed to make it work on all elements
---
 settings.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/settings.php b/settings.php
index f99cd0bb..9fd2482e 100644
--- a/settings.php
+++ b/settings.php
@@ -15,16 +15,6 @@
 		max-width: none;
 		white-space: nowrap;
 	}
-	@-webkit-keyframes Pulse{
-		from {color:#630030;-webkit-text-shadow:0 0 9px #333;}
-		50% {color:#e33100;-webkit-text-shadow:0 0 18px #e33100;}
-		to {color:#630030;-webkit-text-shadow:0 0 9px #333;}
-	}
-	p.lookatme {
-		-webkit-animation-name: Pulse;
-		-webkit-animation-duration: 2s;
-		-webkit-animation-iteration-count: infinite;
-	}
 </style>
 
 <?php // Check if ad lists should be updated after saving ...

From e68a6d72319ddc266bc30d401beed9276efb9a43 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Sun, 11 Jun 2017 15:07:26 +0200
Subject: [PATCH 004/172] pi-hole.css: make 'lookatme'-Rule universal usable

Rule should work on all elements with class 'lookatme', not only on links
---
 style/pi-hole.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style/pi-hole.css b/style/pi-hole.css
index 6dc7b700..52976eb0 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -32,7 +32,7 @@
 	50% {color:#e33100;text-shadow:0 0 5px #e33100;}
 	to {color:#630030;text-shadow:0 0 2px transparent;}
 }
-a.lookatme {
+.lookatme {
 	-webkit-animation-name: Pulse;
 	animation-name: Pulse;
 	-webkit-animation-duration: 2s;

From 0d4185830933a804166931bd88b99630089d2ed4 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Sat, 24 Jun 2017 10:56:19 +0200
Subject: [PATCH 005/172] pi-hole.css: updated glow effect rule

---
 style/pi-hole.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/style/pi-hole.css b/style/pi-hole.css
index 52976eb0..ec911df9 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -13,10 +13,10 @@
 	-o-user-select: none;
 	user-select: none;
 }
-.small-box h3 {
+.small-box span {
 	transition-duration: 500ms;
 }
-.small-box h3.glow {
+.small-box span.glow {
 	text-shadow: 0px 0px 5px #fff;
 }
 .skin-blue .list-group-item:hover {

From 9b3cf91cee90c9cbbe934c9840771c58322bf21c Mon Sep 17 00:00:00 2001
From: ryanknapper <ryanknapper@gmail.com>
Date: Tue, 26 Dec 2017 13:47:40 -0500
Subject: [PATCH 006/172] Update savesettings.php

Added section to save conditional forwarding settings.
---
 scripts/pi-hole/php/savesettings.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index ad1b0eae..495bb076 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -234,6 +234,28 @@ function readAdlists()
 					$extra .= "no-dnssec";
 				}
 
+				// Check if Conditional Forwarding is requested
+				if(isset($_POST["conditionalForwarding"]))
+				{
+					// Validate conditional forwarding IP
+					if (!validIP($_POST["conditionalForwardingIP"]))
+					{
+						$error .= "Conditional forwarding IP (".htmlspecialchars($_POST["conditionalForwardingIP"]).") is invalid!<br>";
+					}
+
+					// Validate conditional forwarding domain name
+					if(!validDomain($_POST["conditionalForwardingDomain"]))
+					{
+						$error .= "Conditional forwarding domain name (".htmlspecialchars($_POST["conditionalForwardingDomain"]).") is invalid!<br>";
+					}
+					if(!$error)
+					{
+						$addressArray = explode(".", $_POST["conditionalForwardingIP"]);
+						$reverseAddress = $addressArray[2].".".$addressArray[1].".".$addressArray[0].".in-addr.arpa";
+						$extra .= " conditional_forwarding ".$_POST["conditionalForwardingIP"]." ".$_POST["conditionalForwardingDomain"]." $reverseAddress";
+					}
+				}
+				
 				// Check if DNSinterface is set
 				if(isset($_POST["DNSinterface"]))
 				{

From 9bde9db332a266be4328522239d0c8d1ab4836f4 Mon Sep 17 00:00:00 2001
From: ryanknapper <ryanknapper@gmail.com>
Date: Tue, 26 Dec 2017 13:50:25 -0500
Subject: [PATCH 007/172] Update settings.php

Added configuration section to specify the conditional forwarding options.
---
 settings.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/settings.php b/settings.php
index a032c9ee..1e7983ac 100644
--- a/settings.php
+++ b/settings.php
@@ -176,6 +176,13 @@ if (isset($setupVars["DNSMASQ_LISTENING"])) {
 } else {
     $DNSinterface = "single";
 }
+if (isset($setupVars["CONDITIONAL_FORWARDING"]) && ($setupVars["CONDITIONAL_FORWARDING"] == 1)) {
+    $conditionalForwarding = true;
+    $conditionalForwardingDomain = $setupVars["CONDITIONAL_FORWARDING_DOMAIN"];
+    $conditionalForwardingIP = $setupVars["CONDITIONAL_FORWARDING_IP"];
+} else {
+    $conditionalForwarding = false;
+}
 ?>
 
 <?php
@@ -811,6 +818,41 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                    DNSSEC. Note that the size of your log might increase significantly
                                                    when enabling DNSSEC. A DNSSEC resolver test can be found
                                                    <a href="http://dnssec.vs.uni-due.de/" target="_blank">here</a>.</p>
+                                                <label>Conditional Forwarding</label>
+                                                <p>If not configured as your DHCP server Pi-Hole won't able to
+                                                   determine the names of devices on your local network and tables
+                                                   such as Top Clients will only show IP addresses.  One solution
+                                                   for this is to configure Pi-Hole to forward these requests to
+                                                   your home router, but just for what's inside your home.  To
+                                                   configure this we will need to know the IP address of your
+                                                   router and the name of your local network.</p>
+                                                <p>Note: The local domain name must match the domain name specified in your router.</p>
+                                                <div class="form-group">
+                                                    <div class="checkbox">
+                                                        <label><input type="checkbox" name="conditionalForwarding" value="conditionalForwarding"
+                                                        <?php if(isset($conditionalForwarding) && ($conditionalForwarding == true)){ ?>checked<?php }
+                                                        ?>>Use Conditional Forwarding</label>
+                                                    </div>
+                                                    <div class="input-group">
+                                                      <table class="table table-bordered">
+                                                        <tr>
+                                                          <th>IP of your router</th>
+                                                          <th>Local domain name</th>
+                                                        </tr>
+                                                        <tr>
+                                                          <div class="input-group">
+                                                            <td>
+                                                              <input type="text" name="conditionalForwardingIP" class="form-control" data-inputmask="'alias': 'ip'" data-mask 
+                                                              <?php if(isset($conditionalForwardingIP)){ ?>value="<?php echo $conditionalForwardingIP; ?>"<?php } ?>>
+                                                            </td>
+                                                            <td><input type="text" name="conditionalForwardingDomain" class="form-control" data-mask 
+                                                              <?php if(isset($conditionalForwardingDomain)){ ?>value="<?php echo $conditionalForwardingDomain; ?>"<?php } ?>>
+                                                            </td>
+                                                          </div>
+                                                        </tr>
+                                                      </table>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>

From 147773c2fb68dfd810c430b5826144f1a3544b9c Mon Sep 17 00:00:00 2001
From: ryanknapper <ryanknapper@gmail.com>
Date: Sun, 14 Jan 2018 12:47:24 -0500
Subject: [PATCH 008/172] Update settings.php

Cleaned up the explanation paragraph structure and corrected the project name.
---
 settings.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/settings.php b/settings.php
index 1e7983ac..2c583433 100644
--- a/settings.php
+++ b/settings.php
@@ -819,14 +819,15 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                    when enabling DNSSEC. A DNSSEC resolver test can be found
                                                    <a href="http://dnssec.vs.uni-due.de/" target="_blank">here</a>.</p>
                                                 <label>Conditional Forwarding</label>
-                                                <p>If not configured as your DHCP server Pi-Hole won't able to
-                                                   determine the names of devices on your local network and tables
-                                                   such as Top Clients will only show IP addresses.  One solution
-                                                   for this is to configure Pi-Hole to forward these requests to
-                                                   your home router, but just for what's inside your home.  To
-                                                   configure this we will need to know the IP address of your
-                                                   router and the name of your local network.</p>
-                                                <p>Note: The local domain name must match the domain name specified in your router.</p>
+                                                <p>If not configured as your DHCP server, Pi-hole won't able to
+                                                   determine the names of devices on your local network.  As a
+                                                   result, tables such as Top Clients will only show IP addresses.</p>
+                                                <p>One solution for this is to configure Pi-hole to forward these
+	                                                 requests to your home router, but only for devices on your
+	                                                 home network.  To configure this we will need to know the IP
+	                                                 address of your router and the name of your local network.</p>
+                                                <p>Note: The local domain name must match the domain name specified
+	                                                 in your router, likely found within the DHCP settings.</p>
                                                 <div class="form-group">
                                                     <div class="checkbox">
                                                         <label><input type="checkbox" name="conditionalForwarding" value="conditionalForwarding"

From 78f031869feb8f88267673287f018f505a915a81 Mon Sep 17 00:00:00 2001
From: ail1020 <ail1020@users.noreply.github.com>
Date: Sun, 28 Jan 2018 20:17:48 -0600
Subject: [PATCH 009/172] Display the name of the blocklist URL

added -adlist arg to the query command
---
 scripts/pi-hole/php/queryads.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 133ea12c..0de64cb0 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -58,7 +58,7 @@ else
     $exact = "";
 }
 
-$proc = popen("sudo pihole -q ".$url." ".$exact, 'r');
+$proc = popen("sudo pihole -q -adlist ".$url." ".$exact, 'r');
 while (!feof($proc)) {
     echoEvent(fread($proc, 4096));
 }

From c5931ee746ab154224c1a88f8f93495cab495654 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Feb 2018 20:38:15 +0100
Subject: [PATCH 010/172] Show more details for forwarded queries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 722f8543..453774b5 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -82,7 +82,7 @@ function add(domain,list) {
             }
         });
     });
-        
+
     // Reset Modal after it has faded out
     alertModal.one("hidden.bs.modal", function() {
         alProcessing.show();
@@ -210,6 +210,23 @@ $(document).ready(function() {
                 $("td:eq(5)", row).css("color","black");
                 $("td:eq(5)", row).html( "-" );
             }
+
+            // Check for existance of sixth column
+            if(data.length > 5)
+            {
+	            if (data[6] === "1")
+	            {
+	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NODATA)");
+	            }
+	            else if (data[6] === "2")
+	            {
+	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NXDOMAIN)");
+	            }
+	            else if (data[6] === "3")
+	            {
+	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (CNAME)");
+	            }
+	    }
         },
         dom: "<'row'<'col-sm-12'f>>" +
              "<'row'<'col-sm-4'l><'col-sm-8'p>>" +

From a2f6b7d7a0819a2358c1800f18ef0427cff4d026 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Feb 2018 20:50:27 +0100
Subject: [PATCH 011/172] Make sure to not mix spaces and tabs :codacy:

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 453774b5..6d6ee74b 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -214,19 +214,19 @@ $(document).ready(function() {
             // Check for existance of sixth column
             if(data.length > 5)
             {
-	            if (data[6] === "1")
-	            {
-	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NODATA)");
-	            }
-	            else if (data[6] === "2")
-	            {
-	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NXDOMAIN)");
-	            }
-	            else if (data[6] === "3")
-	            {
-	                $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (CNAME)");
-	            }
-	    }
+                if (data[6] === "1")
+                {
+                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NODATA)");
+                }
+                else if (data[6] === "2")
+                {
+                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NXDOMAIN)");
+                }
+                else if (data[6] === "3")
+                {
+                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (CNAME)");
+                }
+            }
         },
         dom: "<'row'<'col-sm-12'f>>" +
              "<'row'<'col-sm-4'l><'col-sm-8'p>>" +

From aec42487de0ea3a3c307d91075083e3051ae1699 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Feb 2018 20:55:12 +0100
Subject: [PATCH 012/172] Add IP display

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 6d6ee74b..666bdcc8 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -226,6 +226,10 @@ $(document).ready(function() {
                 {
                     $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (CNAME)");
                 }
+                else if (data[6] === "4")
+                {
+                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (IP)");
+                }
             }
         },
         dom: "<'row'<'col-sm-12'f>>" +

From 37b8d59340f0cbb09005a861f5e6115d7dd5c590 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Feb 2018 21:01:09 +0100
Subject: [PATCH 013/172] Don't show details for blocked queries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 666bdcc8..639a1a05 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -145,8 +145,10 @@ $(document).ready(function() {
 
     tableApi = $("#all-queries").DataTable( {
         "rowCallback": function( row, data, index ){
+            var blocked = false;
             if (data[4] === "1")
             {
+                blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed" );
                 $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
@@ -165,12 +167,14 @@ $(document).ready(function() {
             }
             else if (data[4] === "4")
             {
+                blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)" );
                 $("td:eq(6)", row).html( "" );
             }
             else if (data[4] === "5")
             {
+                blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(blacklist)" );
                 $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
@@ -211,24 +215,24 @@ $(document).ready(function() {
                 $("td:eq(5)", row).html( "-" );
             }
 
-            // Check for existance of sixth column
-            if(data.length > 5)
+            // Check for existance of sixth column and display only if not Pi-holed
+            if(data.length > 5 && !blocked)
             {
                 if (data[6] === "1")
                 {
-                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NODATA)");
+                    $("td:eq(2)", row).html(data[2] + " (NODATA)");
                 }
                 else if (data[6] === "2")
                 {
-                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (NXDOMAIN)");
+                    $("td:eq(2)", row).html(data[2] + " (NXDOMAIN)");
                 }
                 else if (data[6] === "3")
                 {
-                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (CNAME)");
+                    $("td:eq(2)", row).html(data[2] + " (CNAME)");
                 }
                 else if (data[6] === "4")
                 {
-                    $("td:eq(2)", row).html($("td:eq(2)", row).html()+" (IP)");
+                    $("td:eq(2)", row).html(data[2] + " (IP)");
                 }
             }
         },

From b549a5228d116563b8c63233250dab878774703c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Feb 2018 21:58:36 +0100
Subject: [PATCH 014/172] Distinguish between NODATA-IPv4 and NODATA-IPv6

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 639a1a05..0d54df1c 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -220,7 +220,7 @@ $(document).ready(function() {
             {
                 if (data[6] === "1")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (NODATA)");
+                    $("td:eq(2)", row).html(data[2] + " (NODATA-" + data[1] + ")");
                 }
                 else if (data[6] === "2")
                 {

From 1db322b96367ab5f5d6cc3dccbf591e5e08879f1 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 10 Feb 2018 14:10:55 +0100
Subject: [PATCH 015/172] Show most recent 100 queries instead of queries
 within most recent 10 minutes

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php                   |  4 ++++
 queries.php                   |  2 +-
 scripts/pi-hole/js/queries.js | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index d4e1c085..61efa5b9 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -230,6 +230,10 @@ if (isset($_GET['getAllQueries']) && $auth)
 		// Get specific client only
 		sendRequestFTL("getallqueries-client ".$_GET['client']);
 	}
+	else if(is_numeric($_GET['getAllQueries']))
+	{
+		sendRequestFTL("getallqueries (".$_GET['getAllQueries'].")");
+	}
 	else
 	{
 		// Get all queries
diff --git a/queries.php b/queries.php
index 89ed91d7..792ee2a3 100644
--- a/queries.php
+++ b/queries.php
@@ -59,7 +59,7 @@ else if(isset($_GET["from"]) && isset($_GET["until"]))
 }
 else
 {
-	$showing .= " within recent 10 minutes, <a href=\"?all\">show all</a>";
+	$showing .= ", most recent 100, <a href=\"?all\">show all</a>";
 }
 
 if(isset($setupVars["API_PRIVACY_MODE"]))
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 722f8543..623ce881 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -122,26 +122,27 @@ $(document).ready(function() {
     location.search.substr(1).split("&").forEach(function(item) {GETDict[item.split("=")[0]] = item.split("=")[1];});
 
     var APIstring = "api.php?getAllQueries";
+    var options = "";
 
     if("from" in GETDict && "until" in GETDict)
     {
-        APIstring += "&from="+GETDict["from"];
+        options += "&from="+GETDict["from"];
         APIstring += "&until="+GETDict["until"];
     }
     else if("client" in GETDict)
     {
-        APIstring += "&client="+GETDict["client"];
+        options += "&client="+GETDict["client"];
     }
     else if("domain" in GETDict)
     {
-        APIstring += "&domain="+GETDict["domain"];
+        options += "&domain="+GETDict["domain"];
     }
+    // If we don't ask filtering and also not for all queries, just request the most recent 100 queries
     else if(!("all" in GETDict))
     {
-        var timestamp = Math.floor(Date.now() / 1000);
-        APIstring += "&from="+(timestamp - 600);
-        APIstring += "&until="+(timestamp + 100);
+        APIstring += "=100";
     }
+    APIstring += options;
 
     tableApi = $("#all-queries").DataTable( {
         "rowCallback": function( row, data, index ){

From c62daea621eb9b7dd174f671ce951316736d53bb Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 10 Feb 2018 16:32:29 +0100
Subject: [PATCH 016/172] Remove unnecessary options variable

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 623ce881..58ec73b9 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -82,7 +82,7 @@ function add(domain,list) {
             }
         });
     });
-        
+
     // Reset Modal after it has faded out
     alertModal.one("hidden.bs.modal", function() {
         alProcessing.show();
@@ -122,27 +122,25 @@ $(document).ready(function() {
     location.search.substr(1).split("&").forEach(function(item) {GETDict[item.split("=")[0]] = item.split("=")[1];});
 
     var APIstring = "api.php?getAllQueries";
-    var options = "";
 
     if("from" in GETDict && "until" in GETDict)
     {
-        options += "&from="+GETDict["from"];
+        APIstring += "&from="+GETDict["from"];
         APIstring += "&until="+GETDict["until"];
     }
     else if("client" in GETDict)
     {
-        options += "&client="+GETDict["client"];
+        APIstring += "&client="+GETDict["client"];
     }
     else if("domain" in GETDict)
     {
-        options += "&domain="+GETDict["domain"];
+        APIstring += "&domain="+GETDict["domain"];
     }
     // If we don't ask filtering and also not for all queries, just request the most recent 100 queries
     else if(!("all" in GETDict))
     {
         APIstring += "=100";
     }
-    APIstring += options;
 
     tableApi = $("#all-queries").DataTable( {
         "rowCallback": function( row, data, index ){

From 0c72e06314762e3bd7990e602b5fd8692f7bb58d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 11 Feb 2018 17:51:23 +0100
Subject: [PATCH 017/172] Also display TTL if available

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 0d54df1c..6921b306 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -216,24 +216,35 @@ $(document).ready(function() {
             }
 
             // Check for existance of sixth column and display only if not Pi-holed
-            if(data.length > 5 && !blocked)
+            if(data.length > 6 && !blocked)
             {
                 if (data[6] === "1")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (NODATA-" + data[1] + ")");
+                    $("td:eq(2)", row).html(data[2] + " (NODATA-" + data[1] + ", ");
                 }
                 else if (data[6] === "2")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (NXDOMAIN)");
+                    $("td:eq(2)", row).html(data[2] + " (NXDOMAIN, ");
                 }
                 else if (data[6] === "3")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (CNAME)");
+                    $("td:eq(2)", row).html(data[2] + " (CNAME, ");
                 }
                 else if (data[6] === "4")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (IP)");
+                    $("td:eq(2)", row).html(data[2] + " (IP, ");
                 }
+                // else
+                // {
+                //   $("td:eq(2)", row).html(data[2] + " (" + data[6] + ", ");
+                // }
+            }
+            if(!blocked)
+            {
+              if(data.length > 7)
+                $("td:eq(2)", row).html($("td:eq(2)", row).html() + "TTL " + data[7] + ")");
+              else
+                $("td:eq(2)", row).html($("td:eq(2)", row).html() + ")");
             }
         },
         dom: "<'row'<'col-sm-12'f>>" +

From 86c9b6cb5724070b91296784be18ce44d582b8d1 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 11 Feb 2018 17:52:48 +0100
Subject: [PATCH 018/172] Clarify what the left table shows

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 2ce90bfe..c56266a4 100644
--- a/index.php
+++ b/index.php
@@ -234,7 +234,7 @@ else
     <div class="<?php echo $tablelayout; ?>">
       <div class="box" id="domain-frequency">
         <div class="box-header with-border">
-          <h3 class="box-title">Top Domains</h3>
+          <h3 class="box-title">Top Permitted Domains</h3>
         </div>
         <!-- /.box-header -->
         <div class="box-body">

From dda0bed8ee63c9c53b60610590416b564e73fe4c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 11 Feb 2018 18:00:52 +0100
Subject: [PATCH 019/172] :codacy: doesn't like non-curly ifs

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 6921b306..f54f22e5 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -242,9 +242,13 @@ $(document).ready(function() {
             if(!blocked)
             {
               if(data.length > 7)
+              {
                 $("td:eq(2)", row).html($("td:eq(2)", row).html() + "TTL " + data[7] + ")");
+              }
               else
+              {
                 $("td:eq(2)", row).html($("td:eq(2)", row).html() + ")");
+              }
             }
         },
         dom: "<'row'<'col-sm-12'f>>" +

From 60dde5314075494ba245785846afafbd31058cc8 Mon Sep 17 00:00:00 2001
From: FoXFTW <hannes@octofox.de>
Date: Tue, 13 Feb 2018 12:54:06 +0100
Subject: [PATCH 020/172] Sort IPs in DHCP Table numerically instead of
 lexicographically

Signed-off-by: FoXFTW <hannes@octofox.de>
---
 settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.php b/settings.php
index a032c9ee..3008ff9a 100644
--- a/settings.php
+++ b/settings.php
@@ -554,7 +554,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                         <tr data-placement="auto" data-container="body" data-toggle="tooltip"
                                                             title="Lease type: IPv<?php echo $lease["type"]; ?><br/>Remaining lease time: <?php echo $lease["TIME"]; ?><br/>DHCP UID: <?php echo $lease["clid"]; ?>">
                                                             <td id="MAC"><?php echo $lease["hwaddr"]; ?></td>
-                                                            <td id="IP"><?php echo $lease["IP"]; ?></td>
+                                                            <td id="IP" data-order="<?php echo bin2hex(inet_pton($lease["IP"])); ?>"><?php echo $lease["IP"]; ?></td>
                                                             <td id="HOST"><?php echo $lease["host"]; ?></td>
                                                             <td>
                                                                 <button class="btn btn-warning btn-xs" type="button" id="button" data-static="alert">
@@ -583,7 +583,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                         <?php foreach ($dhcp_static_leases as $lease) { ?>
                                                         <tr>
                                                             <td><?php echo $lease["hwaddr"]; ?></td>
-                                                            <td><?php echo $lease["IP"]; ?></td>
+                                                            <td data-order="<?php echo bin2hex(inet_pton($lease["IP"])); ?>"><?php echo $lease["IP"]; ?></td>
                                                             <td><?php echo $lease["host"]; ?></td>
                                                             <td><?php if (strlen($lease["hwaddr"]) > 0) { ?>
                                                                 <button class="btn btn-danger btn-xs" type="submit" name="removestatic"

From e963fbf4e0b1620fc442c27d0e45685a887e1be8 Mon Sep 17 00:00:00 2001
From: Toakan <tdaykin@live.co.uk>
Date: Thu, 15 Feb 2018 09:16:48 +0000
Subject: [PATCH 021/172] Modified Taillog to prevent offscreen scrolling.

Signed-off-by: Toakan <tdaykin@live.co.uk>
---
 scripts/pi-hole/js/taillog-FTL.js | 11 ++++++-----
 scripts/pi-hole/js/taillog.js     | 11 ++++++-----
 taillog-FTL.php                   |  2 +-
 taillog.php                       |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/pi-hole/js/taillog-FTL.js b/scripts/pi-hole/js/taillog-FTL.js
index cbe709b5..2645badf 100644
--- a/scripts/pi-hole/js/taillog-FTL.js
+++ b/scripts/pi-hole/js/taillog-FTL.js
@@ -14,14 +14,15 @@ function reloadData(){
     clearTimeout(timer);
     $.getJSON("scripts/pi-hole/php/tailLog.php?FTL&offset="+offset, function (data)
     {
-        offset = data["offset"];
         pre.append(data["lines"]);
+
+        if(scrolling && offset !== data["offset"]) {
+            pre.scrollTop(pre[0].scrollHeight);
+        }
+
+        offset = data["offset"];
     });
 
-    if(scrolling)
-    {
-        window.scrollTo(0,document.body.scrollHeight);
-    }
     timer = setTimeout(reloadData, interval);
 }
 
diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js
index 7e3b2dc3..153bd18d 100644
--- a/scripts/pi-hole/js/taillog.js
+++ b/scripts/pi-hole/js/taillog.js
@@ -14,14 +14,15 @@ function reloadData(){
     clearTimeout(timer);
     $.getJSON("scripts/pi-hole/php/tailLog.php?offset="+offset, function (data)
     {
-        offset = data["offset"];
         pre.append(data["lines"]);
+
+        if(scrolling && offset !== data["offset"]) {
+            pre.scrollTop(pre[0].scrollHeight);
+        }
+
+        offset = data["offset"];
     });
 
-    if(scrolling)
-    {
-        window.scrollTo(0,document.body.scrollHeight);
-    }
     timer = setTimeout(reloadData, interval);
 }
 
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 3c27cdcd..53b454ad 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -13,7 +13,7 @@
 </div>
 
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk1"> Automatic scrolling on update</label></div>
-<pre id="output" style="width: 100%; height: 100%;"></pre>
+<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
 <?php
diff --git a/taillog.php b/taillog.php
index 126648d2..895cba56 100644
--- a/taillog.php
+++ b/taillog.php
@@ -13,7 +13,7 @@
 </div>
 
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk1"> Automatic scrolling on update</label></div>
-<pre id="output" style="width: 100%; height: 100%;"></pre>
+<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
 <?php

From e6a112c54ee8ee69e444709fa92ebf47cc314ea2 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 16 Feb 2018 20:34:43 +0100
Subject: [PATCH 022/172] Remove TTL display, highlight NODATA and NXDOMAIN
 with different colors

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index f54f22e5..f702eb3f 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -220,36 +220,25 @@ $(document).ready(function() {
             {
                 if (data[6] === "1")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (NODATA-" + data[1] + ", ");
+                    $("td:eq(2)", row).html(data[2] + " <span style=\"color:orange;\">(NODATA-" + data[1] + ")</span>");
                 }
                 else if (data[6] === "2")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (NXDOMAIN, ");
+                    $("td:eq(2)", row).html(data[2] + " <span style=\"color:red;\">(NXDOMAIN)</span>");
                 }
                 else if (data[6] === "3")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (CNAME, ");
+                    $("td:eq(2)", row).html(data[2] + " (CNAME)");
                 }
                 else if (data[6] === "4")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (IP, ");
+                    $("td:eq(2)", row).html(data[2] + " (IP)");
                 }
                 // else
                 // {
                 //   $("td:eq(2)", row).html(data[2] + " (" + data[6] + ", ");
                 // }
             }
-            if(!blocked)
-            {
-              if(data.length > 7)
-              {
-                $("td:eq(2)", row).html($("td:eq(2)", row).html() + "TTL " + data[7] + ")");
-              }
-              else
-              {
-                $("td:eq(2)", row).html($("td:eq(2)", row).html() + ")");
-              }
-            }
         },
         dom: "<'row'<'col-sm-12'f>>" +
              "<'row'<'col-sm-4'l><'col-sm-8'p>>" +

From 5d38af4332be236fd2ec8a08145485fd27792c71 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 16 Feb 2018 20:51:14 +0100
Subject: [PATCH 023/172] Add reply type column

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 queries.php                   |  2 ++
 scripts/pi-hole/js/queries.js | 68 ++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/queries.php b/queries.php
index 89ed91d7..f949583d 100644
--- a/queries.php
+++ b/queries.php
@@ -135,6 +135,7 @@ if(strlen($showing) > 0)
                         <th>Domain</th>
                         <th>Client</th>
                         <th>Status</th>
+                        <th>Reply</th>
                         <th>DNSSEC</th>
                         <th>Action</th>
                     </tr>
@@ -146,6 +147,7 @@ if(strlen($showing) > 0)
                         <th>Domain</th>
                         <th>Client</th>
                         <th>Status</th>
+                        <th>Reply</th>
                         <th>DNSSEC</th>
                         <th>Action</th>
                     </tr>
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index f702eb3f..8d101dbc 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -151,68 +151,68 @@ $(document).ready(function() {
                 blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed" );
-                $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
+                $("td:eq(7)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else if (data[4] === "2")
             {
                 $(row).css("color","green");
                 $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(forwarded)" );
-                $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
+                $("td:eq(7)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "3")
             {
                 $(row).css("color","green");
                 $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(cached)" );
-                $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
+                $("td:eq(7)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "4")
             {
                 blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)" );
-                $("td:eq(6)", row).html( "" );
+                $("td:eq(7)", row).html( "" );
             }
             else if (data[4] === "5")
             {
                 blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(blacklist)" );
-                $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
+                $("td:eq(7)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else
             {
                 $("td:eq(4)", row).html( "Unknown" );
-                $("td:eq(6)", row).html( "" );
+                $("td:eq(7)", row).html( "" );
             }
             if (data[5] === "1")
             {
-                $("td:eq(5)", row).css("color","green");
-                $("td:eq(5)", row).html( "SECURE" );
+                $("td:eq(6)", row).css("color","green");
+                $("td:eq(6)", row).html( "SECURE" );
             }
             else if (data[5] === "2")
             {
-                $("td:eq(5)", row).css("color","orange");
-                $("td:eq(5)", row).html( "INSECURE" );
+                $("td:eq(6)", row).css("color","orange");
+                $("td:eq(6)", row).html( "INSECURE" );
             }
             else if (data[5] === "3")
             {
-                $("td:eq(5)", row).css("color","red");
-                $("td:eq(5)", row).html( "BOGUS" );
+                $("td:eq(6)", row).css("color","red");
+                $("td:eq(6)", row).html( "BOGUS" );
             }
             else if (data[5] === "4")
             {
-                $("td:eq(5)", row).css("color","red");
-                $("td:eq(5)", row).html( "ABANDONED" );
+                $("td:eq(6)", row).css("color","red");
+                $("td:eq(6)", row).html( "ABANDONED" );
             }
             else if (data[5] === "5")
             {
-                $("td:eq(5)", row).css("color","red");
-                $("td:eq(5)", row).html( "?" );
+                $("td:eq(6)", row).css("color","red");
+                $("td:eq(6)", row).html( "?" );
             }
             else
             {
-                $("td:eq(5)", row).css("color","black");
-                $("td:eq(5)", row).html( "-" );
+                $("td:eq(6)", row).css("color","black");
+                $("td:eq(6)", row).html( "-" );
             }
 
             // Check for existance of sixth column and display only if not Pi-holed
@@ -220,25 +220,34 @@ $(document).ready(function() {
             {
                 if (data[6] === "1")
                 {
-                    $("td:eq(2)", row).html(data[2] + " <span style=\"color:orange;\">(NODATA-" + data[1] + ")</span>");
+                    $("td:eq(5)", row).css("color","black");
+                    $("td:eq(5)", row).html("NODATA-" + data[1]);
                 }
                 else if (data[6] === "2")
                 {
-                    $("td:eq(2)", row).html(data[2] + " <span style=\"color:red;\">(NXDOMAIN)</span>");
+                    $("td:eq(5)", row).css("color","black");
+                    $("td:eq(5)", row).html("NXDOMAIN");
                 }
                 else if (data[6] === "3")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (CNAME)");
+                    $("td:eq(5)", row).css("color","green");
+                    $("td:eq(5)", row).html("CNAME");
                 }
                 else if (data[6] === "4")
                 {
-                    $("td:eq(2)", row).html(data[2] + " (IP)");
+                    $("td:eq(5)", row).css("color","green");
+                    $("td:eq(5)", row).html("IP");
+                }
+                else
+                {
+                    $("td:eq(5)", row).html("? ("+data[6]+")");
                 }
-                // else
-                // {
-                //   $("td:eq(2)", row).html(data[2] + " (" + data[6] + ", ");
-                // }
             }
+            else
+            {
+                $("td:eq(5)", row).html("-");
+            }
+
         },
         dom: "<'row'<'col-sm-12'f>>" +
              "<'row'<'col-sm-4'l><'col-sm-8'p>>" +
@@ -250,11 +259,12 @@ $(document).ready(function() {
         "order" : [[0, "desc"]],
         "columns": [
             { "width" : "15%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");}else{return data;} }},
-            { "width" : "10%" },
-            { "width" : "37%", "render": $.fn.dataTable.render.text() },
+            { "width" : "4%" },
+            { "width" : "36%", "render": $.fn.dataTable.render.text() },
             { "width" : "8%", "render": $.fn.dataTable.render.text() },
             { "width" : "10%" },
-            { "width" : "5%" },
+            { "width" : "8%" },
+            { "width" : "4%" },
             { "width" : "10%" }
         ],
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],

From 937a76bf9b16eb799269191ae98be6df78b31298 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 16 Feb 2018 21:01:05 +0100
Subject: [PATCH 024/172] Remove color from reply column

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 8d101dbc..fbfb9a0e 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -211,31 +211,27 @@ $(document).ready(function() {
             }
             else
             {
-                $("td:eq(6)", row).css("color","black");
                 $("td:eq(6)", row).html( "-" );
             }
 
             // Check for existance of sixth column and display only if not Pi-holed
             if(data.length > 6 && !blocked)
             {
+                $("td:eq(5)", row).css("color","black");
                 if (data[6] === "1")
                 {
-                    $("td:eq(5)", row).css("color","black");
                     $("td:eq(5)", row).html("NODATA-" + data[1]);
                 }
                 else if (data[6] === "2")
                 {
-                    $("td:eq(5)", row).css("color","black");
                     $("td:eq(5)", row).html("NXDOMAIN");
                 }
                 else if (data[6] === "3")
                 {
-                    $("td:eq(5)", row).css("color","green");
                     $("td:eq(5)", row).html("CNAME");
                 }
                 else if (data[6] === "4")
                 {
-                    $("td:eq(5)", row).css("color","green");
                     $("td:eq(5)", row).html("IP");
                 }
                 else
@@ -245,6 +241,7 @@ $(document).ready(function() {
             }
             else
             {
+                $("td:eq(5)", row).css("color","black");
                 $("td:eq(5)", row).html("-");
             }
 

From 6ec8dcdc25f0a36bfaaea23ba34d95eb8de0c01c Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Sat, 17 Feb 2018 13:17:17 +0000
Subject: [PATCH 025/172] remove blurb about default whitelist items. No longer
 needed as we do not whitelist anything

Signed-off-by: Adam Warner <adamw@rner.email>
---
 list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/list.php b/list.php
index 5efde479..93bd0f56 100644
--- a/list.php
+++ b/list.php
@@ -30,7 +30,6 @@ function getFullName() {
 <div class="page-header">
     <h1><?php getFullName(); ?></h1>
 </div>
-<?php if($list == "white"){ ?><p>Note that the ad list domains are automatically added to the whitelist so that a list can never get blocked by another list.</p><?php } ?>
 
 <!-- Domain Input -->
 <div class="form-group input-group">
@@ -46,8 +45,7 @@ function getFullName() {
     </span>
 </div>
 <?php if($list === "white") { ?>
-    <p>Note: Whitelisting a subdomain of a wildcard blocked domain is not possible.</p>
-    <p>Some of the domains shown below are domains of the adlists sources, which are automatically added in order to prevent adlists being able to blacklist each other. See <a href="https://github.com/pi-hole/pi-hole/blob/master/adlists.default" target="_blank">here</a> for the default set of adlists.</p>
+    <p>Note: Whitelisting a subdomain of a wildcard blocked domain is not possible.</p>    
 <?php } ?>
 
 <!-- Alerts -->

From 3769069a0ad11d67a3188336d393d0cc926423ad Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 17 Feb 2018 19:51:36 +0100
Subject: [PATCH 026/172] Obtain host names for IP addresses in database. This
 can also handle cases where we have mixed host names and IP addresses in the
 result (Pi-hole v3.3+ stores IP addresses in the database, for consistency)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/api_db.php b/api_db.php
index 21f1106d..3e3fdf03 100644
--- a/api_db.php
+++ b/api_db.php
@@ -74,10 +74,32 @@ if (isset($_GET['getAllQueries']) && $auth)
 		$stmt->bindValue(":from", intval($from), SQLITE3_INTEGER);
 		$stmt->bindValue(":until", intval($until), SQLITE3_INTEGER);
 		$results = $stmt->execute();
+		$clients = array();
 		if(!is_bool($results))
 			while ($row = $results->fetchArray())
 			{
-				$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$row[3],$row[4]];
+				$c = $row[3];
+				if(array_key_exists($row[3], $clients))
+				{
+					// Entry already exists
+					$c = $clients[$row[3]];
+				}
+				else
+				{
+					if(filter_var($row[3], FILTER_VALIDATE_IP))
+					{
+						// Get host name of client and convert to lower case
+						$c = strtolower(gethostbyaddr($row[3]));
+					}
+					else
+					{
+						// This is already a host name
+						$c = strtolower($row[3]);
+					}
+					// Buffer result
+					$clients[$row[3]] = $c;
+				}
+				$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
 			}
 	}
 	$result = array('data' => $allQueries);
@@ -110,8 +132,16 @@ if (isset($_GET['topClients']) && $auth)
 	if(!is_bool($results))
 		while ($row = $results->fetchArray())
 		{
-			// Convert client to lower case
-			$c = strtolower($row[0]);
+			if(filter_var($row[0], FILTER_VALIDATE_IP))
+			{
+				// Get host name of client and convert to lower case
+				$c = strtolower(gethostbyaddr($row[0]));
+			}
+			else
+			{
+				// This is already a host name
+				$c = strtolower($row[0]);
+			}
 			if(array_key_exists($c, $clients))
 			{
 				// Entry already exists, add to it (might appear multiple times due to mixed capitalization in the database)

From 02f14ceb0551549a2c6764dcf4691690c83c3e4f Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Feb 2018 09:44:01 +0100
Subject: [PATCH 027/172] Add name resolution capabilites (with caching) for
 web interface

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php                 | 28 ++++------------------------
 scripts/pi-hole/php/FTL.php | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index d4e1c085..f45efb74 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -155,14 +155,7 @@ if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		if(count($tmp) == 4)
-		{
-			$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
-		}
-		else
-		{
-			$top_clients[$tmp[2]] = intval($tmp[1]);
-		}
+		$top_clients[resolveHostname($tmp[2])] = intval($tmp[1]);
 	}
 
 	$result = array('top_sources' => $top_clients);
@@ -184,14 +177,7 @@ if (isset($_GET['getForwardDestinations']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		if(count($tmp) == 4)
-		{
-			$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
-		}
-		else
-		{
-			$forward_dest[$tmp[2]] = floatval($tmp[1]);
-		}
+		$forward_dest[resolveHostname($tmp[2])] = floatval($tmp[1]);
 	}
 
 	$result = array('forward_destinations' => $forward_dest);
@@ -240,6 +226,7 @@ if (isset($_GET['getAllQueries']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
+		$tmp[3] = resolveHostname($tmp[3]);
 		array_push($allQueries,$tmp);
 	}
 
@@ -318,14 +305,7 @@ if (isset($_GET['getClientNames']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		if(count($tmp) == 4)
-		{
-			$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
-		}
-		else
-		{
-			$forward_dest[$tmp[2]] = floatval($tmp[1]);
-		}
+		$forward_dest[resolveHostname($tmp[2])] = floatval($tmp[1]);
 	}
 
 	$result = array('clients' => $forward_dest);
diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 0c07ce5d..443164f7 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -138,4 +138,30 @@ function disconnectFTL($quiet=true)
 		echo "OK.\n\n";
 	}
 }
+
+$clients = [];
+function resolveHostname($c)
+{
+	if(array_key_exists($c, $clients))
+	{
+		// Entry already exists
+		$c = $clients[$c];
+	}
+	else
+	{
+		if(filter_var($c, FILTER_VALIDATE_IP))
+		{
+			// Get host name of client and convert to lower case
+			$c = strtolower(gethostbyaddr($c));
+		}
+		else
+		{
+			// This is already a host name
+			$c = strtolower($c);
+		}
+		// Buffer result
+		$clients[$c] = $c;
+	}
+	return $c;
+}
 ?>

From ee4e106d8325a4a678f29ab17c6385d01869686c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Feb 2018 09:52:40 +0100
Subject: [PATCH 028/172] :codacy:

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/FTL.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 443164f7..3ced5d81 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -140,28 +140,27 @@ function disconnectFTL($quiet=true)
 }
 
 $clients = [];
-function resolveHostname($c)
+function resolveHostname($clientip)
 {
-	if(array_key_exists($c, $clients))
+	if(array_key_exists($clientip, $clients))
 	{
 		// Entry already exists
-		$c = $clients[$c];
+		$clientname = $clients[$clientip];
+		return $clientname;
+	}
+
+	if(filter_var($clientip, FILTER_VALIDATE_IP))
+	{
+		// Get host name of client and convert to lower case
+		$clientname = strtolower(gethostbyaddr($clientip));
 	}
 	else
 	{
-		if(filter_var($c, FILTER_VALIDATE_IP))
-		{
-			// Get host name of client and convert to lower case
-			$c = strtolower(gethostbyaddr($c));
-		}
-		else
-		{
-			// This is already a host name
-			$c = strtolower($c);
-		}
-		// Buffer result
-		$clients[$c] = $c;
+		// This is already a host name
+		$clientname = strtolower($clientip);
 	}
-	return $c;
+	// Buffer result
+	$clients[$clientname] = $clientip;
+	return $clientname;
 }
 ?>

From 80a7f91449825b5c8815927058e76b6ed38453ee Mon Sep 17 00:00:00 2001
From: Tom <tom@dnomaid.co.uk>
Date: Fri, 2 Mar 2018 16:44:22 +0000
Subject: [PATCH 029/172] Change the whitelist icon in the sidebar

---
 scripts/pi-hole/php/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 709a8093..3851a41d 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -445,7 +445,7 @@ if($auth) {
                 <!-- Whitelist -->
                 <li<?php if($scriptname === "whitelist"){ ?> class="active"<?php } ?>>
                     <a href="list.php?l=white">
-                        <i class="fa fa-pencil-square-o"></i> <span>Whitelist</span>
+                        <i class="fa fa-check-circle-o "></i> <span>Whitelist</span>
                     </a>
                 </li>
                 <!-- Blacklist -->

From 9e5eba4036631b6dfdef60c23c84cf8a2321dd26 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 4 Mar 2018 21:06:28 +0100
Subject: [PATCH 030/172] Return both client IP and hostname in clientname
 string

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/FTL.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 3ced5d81..c317c9da 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -146,7 +146,7 @@ function resolveHostname($clientip)
 	{
 		// Entry already exists
 		$clientname = $clients[$clientip];
-		return $clientname;
+		return $clientname."|".$clientip;
 	}
 
 	if(filter_var($clientip, FILTER_VALIDATE_IP))
@@ -161,6 +161,6 @@ function resolveHostname($clientip)
 	}
 	// Buffer result
 	$clients[$clientname] = $clientip;
-	return $clientname;
+	return $clientname."|".$clientip;
 }
 ?>

From f132122e5753e476e90e3c3122a2477d8b34cf8c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 09:18:37 +0100
Subject: [PATCH 031/172] Use better client host name caching for DB queries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 59 ++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/api_db.php b/api_db.php
index 3e3fdf03..b4bd8cb3 100644
--- a/api_db.php
+++ b/api_db.php
@@ -16,6 +16,30 @@ check_cors();
 ini_set("max_execution_time","600");
 
 $data = array();
+$clients = [];
+function resolveOnlyHostname($clientip)
+{
+	if(array_key_exists($clientip, $clients))
+	{
+		// Entry already exists
+		$clientname = $clients[$clientip];
+		return $clientname;
+	}
+
+	if(filter_var($clientip, FILTER_VALIDATE_IP))
+	{
+		// Get host name of client and convert to lower case
+		$clientname = strtolower(gethostbyaddr($clientip));
+	}
+	else
+	{
+		// This is already a host name
+		$clientname = strtolower($clientip);
+	}
+	// Buffer result
+	$clients[$clientname] = $clientip;
+	return $clientname;
+}
 
 // Get posible non-standard location of FTL's database
 $FTLsettings = parse_ini_file("/etc/pihole/pihole-FTL.conf");
@@ -78,27 +102,7 @@ if (isset($_GET['getAllQueries']) && $auth)
 		if(!is_bool($results))
 			while ($row = $results->fetchArray())
 			{
-				$c = $row[3];
-				if(array_key_exists($row[3], $clients))
-				{
-					// Entry already exists
-					$c = $clients[$row[3]];
-				}
-				else
-				{
-					if(filter_var($row[3], FILTER_VALIDATE_IP))
-					{
-						// Get host name of client and convert to lower case
-						$c = strtolower(gethostbyaddr($row[3]));
-					}
-					else
-					{
-						// This is already a host name
-						$c = strtolower($row[3]);
-					}
-					// Buffer result
-					$clients[$row[3]] = $c;
-				}
+				$c = resolveOnlyHostname($row[3]);
 				$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
 			}
 	}
@@ -132,16 +136,9 @@ if (isset($_GET['topClients']) && $auth)
 	if(!is_bool($results))
 		while ($row = $results->fetchArray())
 		{
-			if(filter_var($row[0], FILTER_VALIDATE_IP))
-			{
-				// Get host name of client and convert to lower case
-				$c = strtolower(gethostbyaddr($row[0]));
-			}
-			else
-			{
-				// This is already a host name
-				$c = strtolower($row[0]);
-			}
+
+			$c = resolveOnlyHostname($row[0]);
+
 			if(array_key_exists($c, $clients))
 			{
 				// Entry already exists, add to it (might appear multiple times due to mixed capitalization in the database)

From 746ac1ea3f0fbf470da3f1728f6852915a41a44e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 15:45:22 +0100
Subject: [PATCH 032/172] Prevent confusion between arrays

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/api_db.php b/api_db.php
index b4bd8cb3..7c126297 100644
--- a/api_db.php
+++ b/api_db.php
@@ -131,7 +131,7 @@ if (isset($_GET['topClients']) && $auth)
 	$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
 	$results = $stmt->execute();
 
-	$clients = array();
+	$clientnums = array();
 
 	if(!is_bool($results))
 		while ($row = $results->fetchArray())
@@ -139,25 +139,25 @@ if (isset($_GET['topClients']) && $auth)
 
 			$c = resolveOnlyHostname($row[0]);
 
-			if(array_key_exists($c, $clients))
+			if(array_key_exists($c, $clientnums))
 			{
 				// Entry already exists, add to it (might appear multiple times due to mixed capitalization in the database)
-				$clients[$c] += intval($row[1]);
+				$clientnums[$c] += intval($row[1]);
 			}
 			else
 			{
 				// Entry does not yet exist
-				$clients[$c] = intval($row[1]);
+				$clientnums[$c] = intval($row[1]);
 			}
 		}
 
 	// Sort by number of hits
-	arsort($clients);
+	arsort($clientnums);
 
 	// Extract only the first ten entries
-	$clients = array_slice($clients, 0, 10);
+	$clientnums = array_slice($clientnums, 0, 10);
 
-	$result = array('top_sources' => $clients);
+	$result = array('top_sources' => $clientnums);
 	$data = array_merge($data, $result);
 }
 

From 57f0642c0f8afb4a6d450eb4e597b94b5f12e788 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 15:46:23 +0100
Subject: [PATCH 033/172] Remove unused array

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api_db.php b/api_db.php
index 7c126297..0c3686f2 100644
--- a/api_db.php
+++ b/api_db.php
@@ -98,7 +98,6 @@ if (isset($_GET['getAllQueries']) && $auth)
 		$stmt->bindValue(":from", intval($from), SQLITE3_INTEGER);
 		$stmt->bindValue(":until", intval($until), SQLITE3_INTEGER);
 		$results = $stmt->execute();
-		$clients = array();
 		if(!is_bool($results))
 			while ($row = $results->fetchArray())
 			{

From 1ec38e3a797c57b82b63a88605a9f10619a8e90b Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 16:35:42 +0100
Subject: [PATCH 034/172] Don't want IPs in Query Log output

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php                 |  6 +++---
 scripts/pi-hole/php/FTL.php | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index f45efb74..f6aedde2 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -155,7 +155,7 @@ if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$top_clients[resolveHostname($tmp[2])] = intval($tmp[1]);
+		$top_clients[resolveHostname($tmp[2],true)] = intval($tmp[1]);
 	}
 
 	$result = array('top_sources' => $top_clients);
@@ -177,7 +177,7 @@ if (isset($_GET['getForwardDestinations']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$forward_dest[resolveHostname($tmp[2])] = floatval($tmp[1]);
+		$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
 	}
 
 	$result = array('forward_destinations' => $forward_dest);
@@ -226,7 +226,7 @@ if (isset($_GET['getAllQueries']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$tmp[3] = resolveHostname($tmp[3]);
+		$tmp[3] = resolveHostname($tmp[3],false);
 		array_push($allQueries,$tmp);
 	}
 
diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index c317c9da..a3b859ce 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -139,17 +139,19 @@ function disconnectFTL($quiet=true)
 	}
 }
 
-$clients = [];
-function resolveHostname($clientip)
+$clients = array();
+function resolveHostname($clientip, $printIP)
 {
 	if(array_key_exists($clientip, $clients))
 	{
 		// Entry already exists
 		$clientname = $clients[$clientip];
-		return $clientname."|".$clientip;
+		if($printIP)
+			return $clientname."|".$clientip;
+		return $clientname;
 	}
 
-	if(filter_var($clientip, FILTER_VALIDATE_IP))
+	else if(filter_var($clientip, FILTER_VALIDATE_IP))
 	{
 		// Get host name of client and convert to lower case
 		$clientname = strtolower(gethostbyaddr($clientip));
@@ -161,6 +163,9 @@ function resolveHostname($clientip)
 	}
 	// Buffer result
 	$clients[$clientname] = $clientip;
-	return $clientname."|".$clientip;
+
+	if($printIP)
+		return $clientname."|".$clientip;
+	return $clientname;
 }
 ?>

From c1ffcdd9975bb4be71d9395b85a593df473eab5e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 16:43:28 +0100
Subject: [PATCH 035/172] Fix resolveHostname() subroutine

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/FTL.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index a3b859ce..0f6d9a3a 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -142,10 +142,12 @@ function disconnectFTL($quiet=true)
 $clients = array();
 function resolveHostname($clientip, $printIP)
 {
+	global $clients;
+	$ipaddr = strtolower($clientip);
 	if(array_key_exists($clientip, $clients))
 	{
 		// Entry already exists
-		$clientname = $clients[$clientip];
+		$clientname = $clients[$ipaddr];
 		if($printIP)
 			return $clientname."|".$clientip;
 		return $clientname;
@@ -154,15 +156,15 @@ function resolveHostname($clientip, $printIP)
 	else if(filter_var($clientip, FILTER_VALIDATE_IP))
 	{
 		// Get host name of client and convert to lower case
-		$clientname = strtolower(gethostbyaddr($clientip));
+		$clientname = strtolower(gethostbyaddr($ipaddr));
 	}
 	else
 	{
 		// This is already a host name
-		$clientname = strtolower($clientip);
+		$clientname = $ipaddr;
 	}
 	// Buffer result
-	$clients[$clientname] = $clientip;
+	$clients[$ipaddr] = $clientname;
 
 	if($printIP)
 		return $clientname."|".$clientip;

From 322b87befe78e9f8b5ee8515dadea811ebd147c9 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Mar 2018 16:48:05 +0100
Subject: [PATCH 036/172] Imporve resolveHostname() subroutine

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/api_db.php b/api_db.php
index 0c3686f2..aee13616 100644
--- a/api_db.php
+++ b/api_db.php
@@ -16,28 +16,35 @@ check_cors();
 ini_set("max_execution_time","600");
 
 $data = array();
-$clients = [];
-function resolveOnlyHostname($clientip)
+$clients = array();
+function resolveHostname($clientip, $printIP)
 {
+	global $clients;
+	$ipaddr = strtolower($clientip);
 	if(array_key_exists($clientip, $clients))
 	{
 		// Entry already exists
-		$clientname = $clients[$clientip];
+		$clientname = $clients[$ipaddr];
+		if($printIP)
+			return $clientname."|".$clientip;
 		return $clientname;
 	}
 
-	if(filter_var($clientip, FILTER_VALIDATE_IP))
+	else if(filter_var($clientip, FILTER_VALIDATE_IP))
 	{
 		// Get host name of client and convert to lower case
-		$clientname = strtolower(gethostbyaddr($clientip));
+		$clientname = strtolower(gethostbyaddr($ipaddr));
 	}
 	else
 	{
 		// This is already a host name
-		$clientname = strtolower($clientip);
+		$clientname = $ipaddr;
 	}
 	// Buffer result
-	$clients[$clientname] = $clientip;
+	$clients[$ipaddr] = $clientname;
+
+	if($printIP)
+		return $clientname."|".$clientip;
 	return $clientname;
 }
 
@@ -101,7 +108,7 @@ if (isset($_GET['getAllQueries']) && $auth)
 		if(!is_bool($results))
 			while ($row = $results->fetchArray())
 			{
-				$c = resolveOnlyHostname($row[3]);
+				$c = resolveHostname($row[3],false);
 				$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
 			}
 	}
@@ -136,7 +143,7 @@ if (isset($_GET['topClients']) && $auth)
 		while ($row = $results->fetchArray())
 		{
 
-			$c = resolveOnlyHostname($row[0]);
+			$c = resolveHostname($row[0],false);
 
 			if(array_key_exists($c, $clientnums))
 			{

From c278428b288d985474c6f4c4b61f9f2593db1e6d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Mar 2018 06:56:28 +0100
Subject: [PATCH 037/172] Change header texts, move "show all" hyperlink out of
 the parentheses

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 queries.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/queries.php b/queries.php
index 792ee2a3..be147ec1 100644
--- a/queries.php
+++ b/queries.php
@@ -19,47 +19,49 @@ if(isset($setupVars["API_QUERY_LOG_SHOW"]))
 {
 	if($setupVars["API_QUERY_LOG_SHOW"] === "all")
 	{
-		$showing = "showing all queries";
+		$showing = "showing";
 	}
 	elseif($setupVars["API_QUERY_LOG_SHOW"] === "permittedonly")
 	{
-		$showing = "showing permitted queries only";
+		$showing = "showing permitted";
 	}
 	elseif($setupVars["API_QUERY_LOG_SHOW"] === "blockedonly")
 	{
-		$showing = "showing blocked queries only";
+		$showing = "showing blocked";
 	}
 	elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing")
 	{
-		$showing = "showing no queries at all";
+		$showing = "showing no queries (due to setting)";
 	}
 }
 else
 {
 	// If filter variable is not set, we
 	// automatically show all queries
-	$showing = "showing all queries";
+	$showing = "showing queries";
 }
 
+$showall = false;
 if(isset($_GET["all"]))
 {
-	$showing .= " within the Pi-hole log";
+	$showing .= " all queries within the Pi-hole log";
 }
 else if(isset($_GET["client"]))
 {
-	$showing .= " for client ".htmlentities($_GET["client"]);
+	$showing .= " queries for client ".htmlentities($_GET["client"]);
 }
 else if(isset($_GET["domain"]))
 {
-	$showing .= " for domain ".htmlentities($_GET["domain"]);
+	$showing .= " queries for domain ".htmlentities($_GET["domain"]);
 }
-else if(isset($_GET["from"]) && isset($_GET["until"]))
+else if(isset($_GET["from"]) || isset($_GET["until"]))
 {
-	$showing .= " within limited time interval";
+	$showing .= " queries within specified time interval";
 }
 else
 {
-	$showing .= ", most recent 100, <a href=\"?all\">show all</a>";
+	$showing .= " up to 100 queries";
+	$showall = true;
 }
 
 if(isset($setupVars["API_PRIVACY_MODE"]))
@@ -74,6 +76,8 @@ if(isset($setupVars["API_PRIVACY_MODE"]))
 if(strlen($showing) > 0)
 {
 	$showing = "(".$showing.")";
+	if($showall)
+		$showing .= ", <a href=\"?all\">show all</a>";
 }
 ?>
 <!-- Send PHP info to JS -->

From 9be0887dacaac919c8695a3458d90a41a5ed574b Mon Sep 17 00:00:00 2001
From: Frode Aannevik <frode.aa@gmail.com>
Date: Sun, 18 Mar 2018 14:42:12 +0100
Subject: [PATCH 038/172] move flip-status-x span element into menu

fix the issue where the span element
is obscuring the Disable/Enable element

fixes: https://github.com/pi-hole/AdminLTE/issues/698

Signed-off-by: Frode Aannevik <frode.aa@gmail.com>
---
 scripts/pi-hole/php/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 3851a41d..7261ef4b 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -461,7 +461,7 @@ if($auth) {
                     <span class="pull-right-container">
                       <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
                     </span>
-                    <i class="fa fa-stop"></i> <span>Disable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span>
+                    <i class="fa fa-stop"></i> <span>Disable&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
                   </a>
                   <ul class="treeview-menu">
                     <li>
@@ -493,7 +493,7 @@ if($auth) {
                     <!-- <a href="#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
                 </li>
                 <li id="pihole-enable" class="treeview"<?php if ($pistatus == "1") { ?> hidden="true"<?php } ?>>
-                    <a href="#"><i class="fa fa-play"></i> <span id="enableLabel">Enable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-enable"></span></a>
+                    <a href="#"><i class="fa fa-play"></i> <span id="enableLabel">Enable&nbsp;&nbsp;&nbsp;<span id="flip-status-enable"></span></span></a>
                 </li>
                 <!-- Tools -->
                 <li class="treeview <?php if(in_array($scriptname, array("gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php"))){ ?>active<?php } ?>">

From a5ca08c84d94299ecbd07b050d02365b77624c54 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 20 Mar 2018 00:20:09 +0100
Subject: [PATCH 039/172] Add custom tooltip as suggested by user @kh0505 here:
 https://github.com/pi-hole/AdminLTE/issues/603#issuecomment-373933097

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php                   | 25 +++++++++++++++
 scripts/pi-hole/js/index.js | 64 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index c56266a4..416261ac 100644
--- a/index.php
+++ b/index.php
@@ -115,6 +115,31 @@ else
         <div class="box-body">
           <div class="chart">
             <canvas id="clientsChart" width="800" height="140"></canvas>
+		<style>
+                canvas{
+                        -moz-user-select: none;
+                        -webkit-user-select: none;
+                        -ms-user-select: none;
+                }
+                #chartjs-tooltip {
+                        opacity: 1;
+                        position: absolute;
+                        background: rgba(0, 0, 0, .7);
+                        color: white;
+                        border-radius: 3px;
+                        -webkit-transition: all .1s ease;
+                        transition: all .1s ease;
+                        pointer-events: none;
+                        -webkit-transform: translate(-50%, 0);
+                        transform: translate(-50%, 0);
+                }
+                .chartjs-tooltip-key {
+                        display: inline-block;
+                        width: 20px;
+                        height: 10px;
+                        margin-right: 10px;
+                }
+        </style>
           </div>
         </div>
         <div class="overlay">
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 9f8cb8c6..5dd9e853 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -792,8 +792,12 @@ $(document).ready(function() {
             },
             options: {
                 tooltips: {
-                    enabled: true,
+                    enabled: false,
                     mode: "x-axis",
+                    custom: customTooltips,
+                    itemSort: function(a, b) {
+                        return b.yLabel - a.yLabel
+                    },
                     callbacks: {
                         title: function(tooltipItem, data) {
                             var label = tooltipItem[0].xLabel;
@@ -1025,3 +1029,61 @@ $(document).ready(function() {
         updateForwardDestinationsPie();
     }
 });
+
+var customTooltips = function(tooltip) {
+                        // Tooltip Element
+                        var tooltipEl = document.getElementById('chartjs-tooltip');
+                        if (!tooltipEl) {
+                                tooltipEl = document.createElement('div');
+                                tooltipEl.id = 'chartjs-tooltip';
+                                tooltipEl.innerHTML = '<table></table>';
+                                document.body.appendChild(tooltipEl);
+                        }
+                        // Hide if no tooltip
+                        if (tooltip.opacity === 0) {
+                                tooltipEl.style.opacity = 0;
+                                return;
+                        }
+                        // Set caret Position
+                        tooltipEl.classList.remove('above', 'below', 'no-transform');
+                        if (tooltip.yAlign) {
+                                tooltipEl.classList.add(tooltip.yAlign);
+                        } else {
+                                tooltipEl.classList.add('above');
+                        }
+                        function getBody(bodyItem) {
+                                return bodyItem.lines;
+                        }
+                        // Set Text
+                        if (tooltip.body) {
+                                var titleLines = tooltip.title || [];
+                                var bodyLines = tooltip.body.map(getBody);
+                                var innerHtml = '<thead>';
+                                titleLines.forEach(function(title) {
+                                        innerHtml += '<tr><th>' + title + '</th></tr>';
+                                });
+                                innerHtml += '</thead><tbody>';
+                                bodyLines.forEach(function(body, i) {
+                                        var colors = tooltip.labelColors[i];
+                                        var style = 'background:' + colors.backgroundColor;
+                                        style += '; border-color:' + colors.borderColor;
+                                        style += '; border-width: 2px';
+                                        var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
+                                        innerHtml += '<tr><td>' + span + body + '</td></tr>';
+                                });
+                                innerHtml += '</tbody>';
+                                var tableRoot = tooltipEl.querySelector('table');
+                                tableRoot.innerHTML = innerHtml;
+                        }
+
+                        // Display, position, and set styles for font
+                        var position = this._chart.canvas.getBoundingClientRect();
+                        tooltipEl.style.opacity = 1;
+                        tooltipEl.style.left = position.left + tooltip.caretX + "px";
+                        tooltipEl.style.top = position.top + tooltip.caretY + 'px';
+                        tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
+                        tooltipEl.style.fontSize = tooltip.bodyFontSize + 'px';
+                        tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
+                        tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
+
+                };

From 5e7caa0f0bef566f0f6caea0de12c70805e1c3f7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 20 Mar 2018 00:22:16 +0100
Subject: [PATCH 040/172] Move style definition into correct file

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php         | 25 -------------------------
 style/pi-hole.css | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/index.php b/index.php
index 416261ac..c56266a4 100644
--- a/index.php
+++ b/index.php
@@ -115,31 +115,6 @@ else
         <div class="box-body">
           <div class="chart">
             <canvas id="clientsChart" width="800" height="140"></canvas>
-		<style>
-                canvas{
-                        -moz-user-select: none;
-                        -webkit-user-select: none;
-                        -ms-user-select: none;
-                }
-                #chartjs-tooltip {
-                        opacity: 1;
-                        position: absolute;
-                        background: rgba(0, 0, 0, .7);
-                        color: white;
-                        border-radius: 3px;
-                        -webkit-transition: all .1s ease;
-                        transition: all .1s ease;
-                        pointer-events: none;
-                        -webkit-transform: translate(-50%, 0);
-                        transform: translate(-50%, 0);
-                }
-                .chartjs-tooltip-key {
-                        display: inline-block;
-                        width: 20px;
-                        height: 10px;
-                        margin-right: 10px;
-                }
-        </style>
           </div>
         </div>
         <div class="overlay">
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 541d5c6e..6a0279f5 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -115,3 +115,27 @@ a.lookatme {
     -webkit-animation: fa-spin 1s infinite linear;
     animation: fa-spin 1s infinite linear;
 }
+
+canvas{
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}
+#chartjs-tooltip {
+    opacity: 1;
+    position: absolute;
+    background: rgba(0, 0, 0, .7);
+    color: white;
+    border-radius: 3px;
+    -webkit-transition: all .1s ease;
+    transition: all .1s ease;
+    pointer-events: none;
+    -webkit-transform: translate(-50%, 0);
+    transform: translate(-50%, 0);
+}
+.chartjs-tooltip-key {
+    display: inline-block;
+    width: 20px;
+    height: 10px;
+    margin-right: 10px;
+}

From b6be5629ac25fb0ea6bb827a85dafe67fa86d84c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 20 Mar 2018 00:28:39 +0100
Subject: [PATCH 041/172] Show only non-zero entries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 116 ++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 53 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 5dd9e853..7ec8a9c4 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1031,59 +1031,69 @@ $(document).ready(function() {
 });
 
 var customTooltips = function(tooltip) {
-                        // Tooltip Element
-                        var tooltipEl = document.getElementById('chartjs-tooltip');
-                        if (!tooltipEl) {
-                                tooltipEl = document.createElement('div');
-                                tooltipEl.id = 'chartjs-tooltip';
-                                tooltipEl.innerHTML = '<table></table>';
-                                document.body.appendChild(tooltipEl);
-                        }
-                        // Hide if no tooltip
-                        if (tooltip.opacity === 0) {
-                                tooltipEl.style.opacity = 0;
-                                return;
-                        }
-                        // Set caret Position
-                        tooltipEl.classList.remove('above', 'below', 'no-transform');
-                        if (tooltip.yAlign) {
-                                tooltipEl.classList.add(tooltip.yAlign);
-                        } else {
-                                tooltipEl.classList.add('above');
-                        }
-                        function getBody(bodyItem) {
-                                return bodyItem.lines;
-                        }
-                        // Set Text
-                        if (tooltip.body) {
-                                var titleLines = tooltip.title || [];
-                                var bodyLines = tooltip.body.map(getBody);
-                                var innerHtml = '<thead>';
-                                titleLines.forEach(function(title) {
-                                        innerHtml += '<tr><th>' + title + '</th></tr>';
-                                });
-                                innerHtml += '</thead><tbody>';
-                                bodyLines.forEach(function(body, i) {
-                                        var colors = tooltip.labelColors[i];
-                                        var style = 'background:' + colors.backgroundColor;
-                                        style += '; border-color:' + colors.borderColor;
-                                        style += '; border-width: 2px';
-                                        var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
-                                        innerHtml += '<tr><td>' + span + body + '</td></tr>';
-                                });
-                                innerHtml += '</tbody>';
-                                var tableRoot = tooltipEl.querySelector('table');
-                                tableRoot.innerHTML = innerHtml;
+        // Tooltip Element
+        var tooltipEl = document.getElementById('chartjs-tooltip');
+        if (!tooltipEl) {
+                tooltipEl = document.createElement('div');
+                tooltipEl.id = 'chartjs-tooltip';
+                tooltipEl.innerHTML = '<table></table>';
+                document.body.appendChild(tooltipEl);
+        }
+        // Hide if no tooltip
+        if (tooltip.opacity === 0) {
+                tooltipEl.style.opacity = 0;
+                return;
+        }
+        // Set caret Position
+        tooltipEl.classList.remove('above', 'below', 'no-transform');
+        if (tooltip.yAlign) {
+                tooltipEl.classList.add(tooltip.yAlign);
+        } else {
+                tooltipEl.classList.add('above');
+        }
+        function getBody(bodyItem) {
+                return bodyItem.lines;
+        }
+        // Set Text
+        if (tooltip.body) {
+                var titleLines = tooltip.title || [];
+                var bodyLines = tooltip.body.map(getBody);
+                var innerHtml = '<thead>';
+                titleLines.forEach(function(title) {
+                        innerHtml += '<tr><th>' + title + '</th></tr>';
+                });
+                innerHtml += '</thead><tbody>';
+                var printed = 0;
+                bodyLines.forEach(function(body, i) {
+                        var colors = tooltip.labelColors[i];
+                        var style = 'background:' + colors.backgroundColor;
+                        style += '; border-color:' + colors.borderColor;
+                        style += '; border-width: 2px';
+                        var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
+                        var num = body[0].split(':');
+                        if(num[1] > 0)
+                        {
+                            innerHtml += '<tr><td>' + span + body + '</td></tr>';
+                            printed++;
                         }
+                });
+                if(printed < 1)
+                {
+                    innerHtml += '<tr><td>No activity recorded</td></tr>';
+                }
+                innerHtml += '</tbody>';
+                var tableRoot = tooltipEl.querySelector('table');
+                tableRoot.innerHTML = innerHtml;
+        }
 
-                        // Display, position, and set styles for font
-                        var position = this._chart.canvas.getBoundingClientRect();
-                        tooltipEl.style.opacity = 1;
-                        tooltipEl.style.left = position.left + tooltip.caretX + "px";
-                        tooltipEl.style.top = position.top + tooltip.caretY + 'px';
-                        tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
-                        tooltipEl.style.fontSize = tooltip.bodyFontSize + 'px';
-                        tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
-                        tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
+        // Display, position, and set styles for font
+        var position = this._chart.canvas.getBoundingClientRect();
+        tooltipEl.style.opacity = 1;
+        tooltipEl.style.left = position.left + tooltip.caretX + "px";
+        tooltipEl.style.top = position.top + tooltip.caretY + 'px';
+        tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
+        tooltipEl.style.fontSize = tooltip.bodyFontSize + 'px';
+        tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
+        tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
 
-                };
+};

From e3cd76ad7d931c04294758399e07ef187368c396 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 20 Mar 2018 00:50:53 +0100
Subject: [PATCH 042/172] Add simple measure to prevent compression of the
 tooltip at the right edge of the screen (may be improved, not tested on
 mobile screens)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 7ec8a9c4..5e722325 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1088,12 +1088,17 @@ var customTooltips = function(tooltip) {
 
         // Display, position, and set styles for font
         var position = this._chart.canvas.getBoundingClientRect();
+        var width = tooltip.caretX;
+        // Prevent compression of the tooltip at the right edge of the screen
+        if($(document).width() - tooltip.caretX < 400)
+        {
+        	width = $(document).width()-400;
+        }
         tooltipEl.style.opacity = 1;
-        tooltipEl.style.left = position.left + tooltip.caretX + "px";
+        tooltipEl.style.left = position.left + width + "px";
         tooltipEl.style.top = position.top + tooltip.caretY + 'px';
         tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
         tooltipEl.style.fontSize = tooltip.bodyFontSize + 'px';
         tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
         tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
-
 };

From f6b2887b90deba0ef0bf11bca124b078bc936840 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 20 Mar 2018 19:29:11 +0100
Subject: [PATCH 043/172] Slight improvement to CSS

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php         | 2 +-
 style/pi-hole.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index c56266a4..9207cda7 100644
--- a/index.php
+++ b/index.php
@@ -114,7 +114,7 @@ else
         </div>
         <div class="box-body">
           <div class="chart">
-            <canvas id="clientsChart" width="800" height="140"></canvas>
+            <canvas id="clientsChart" width="800" height="140" class="extratooltipcanvas"></canvas>
           </div>
         </div>
         <div class="overlay">
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 6a0279f5..14fdb8aa 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -116,7 +116,7 @@ a.lookatme {
     animation: fa-spin 1s infinite linear;
 }
 
-canvas{
+.extratooltipcanvas{
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;

From f1c516895f15f2046e6127fd3e0102da17e30e5f Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacob.salmela@pi-hole.net>
Date: Thu, 22 Mar 2018 23:56:36 -0500
Subject: [PATCH 044/172] align this readme with the core one.  formatting and
 layout is now the same.  also added a ton of updated screenshots.  finally,
 updated donation and affiliate links

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
---
 README.md | 194 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 174 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index e3f3b257..505edf19 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,186 @@
-Pi-hole Admin Dashboard
-============
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/938b4d9e61b7487da77cf63ba05c683d)](https://www.codacy.com/app/Pi-hole/AdminLTE?utm_source=github.com&utm_medium=referral&utm_content=pi-hole/AdminLTE&utm_campaign=badger)
-[![Join the chat at https://gitter.im/pi-hole/AdminLTE](https://badges.gitter.im/pi-hole/AdminLTE.svg)](https://gitter.im/pi-hole/AdminLTE?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+<p align="center">
+<a href="https://pi-hole.net"><img src="https://pi-hole.github.io/graphics/Vortex/Vortex_with_text.png" width="150" height="255" alt="Pi-hole"></a><br/></br>
+<b>Network-wide ad blocking via your own Linux hardware</b><br/>
+</br>
+<a href="https://pi-hole.net"><img src="https://pi-hole.github.io/graphics/Screenshots/pihole-dashboard.png" alt="Pi-hole Web interface"></a><br/>
+</p>
 
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")
+Pi-hole[®](https://pi-hole.net/trademark-rules-and-brand-guidelines/)'s Web interface (based off of [AdminLTE](https://almsaeedstudio.com))  provides a central location to manage your Pi-hole and review the statistics generated by FTLDNS[™](https://pi-hole.net/trademark-rules-and-brand-guidelines/).
 
-Using **[AdminLTE](https://almsaeedstudio.com)**, this project will create a Web interface for the ad-blocking Pi-hole: **a black hole for Internet advertisements**.
+- **Easy-to-interpret**: simple graphs and beautiful colors make Pi-hole's stats easy to understand
+- **Responsive**: looks great on desktop, tablets, and mobile devices
+- **Useful**: control and configure your Pi-hole with our settings
+- **Insightful**: use the query log, audit log, or long-term stats to gain insight into your networks activity
 
-From this interface, you will be able to see stats on how well your Pi-hole is performing.  You will also be able to update the lists used to block ads.
+---
+<a class="badge-align" href="https://www.codacy.com/app/Pi-hole/AdminLTE?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=pi-hole/AdminLTE&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/10540ea45a3b4d5f992c05a2c9714609"/></a>
+<img src="https://pi-hole.github.io/graphics/Badges/browserstack-badge.png" height="80"><br>
 
-![Pi-hole Web interface](http://i.imgur.com/EgGZXbT.png)
+# Installation
+
+The Web interface is enabled by default when you install Pi-hole.
+
+## Post-installation: access the Web interface and gain insight into your network's activity
+There are several ways to [access the dashboard](https://discourse.pi-hole.net/t/how-do-i-access-pi-holes-dashboard-admin-interface/3168):
+
+1. `http://<IP_ADDPRESS_OF_YOUR_PI_HOLE>/admin/`
+2. `http:/pi.hole/admin/` (when using Pi-hole as your DNS server)
+3. `http://pi.hole/` (when using Pi-hole as your DNS server)
+
+Once logged in (forgot your password?), you can view your network stats to see things like:
+
+- the domains being queried on your network
+- the time the queries were initiated
+- the amount of domains that were blocked
+- the upstream server queries were sent to
+- the type of queries (`A`, `AAAA`, `CNAME`, `SRV`, `TXT`, etc.)
+---
+
+## Pi-hole is free, but powered by your support
+There are many reoccurring costs involved with maintaining free, open source, and privacy respecting software; expenses which [our volunteer developers](https://github.com/orgs/pi-hole/people) pitch in to cover out-of-pocket. This is just one example of how strongly we feel about our software, as well as the importance of keeping it maintained.
+
+Make no mistake: **your support is absolutely vital to help keep us innovating!**
+
+### Donations
+Sending a donation using our links below is **extremely helpful** in offsetting a portion of our monthly expenses:
+
+- <img src="https://pi-hole.github.io/graphics/Badges/paypal-badge-black.svg" width="24" height="24" alt="PP"/> <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY">Donate via PayPal</a><br/>
+- <img src="https://pi-hole.github.io/graphics/Badges/bitcoin-badge-black.svg" width="24" height="24" alt="BTC"/> [Bitcoin](https://commerce.coinbase.com/checkout/fb7facaf-bebd-46be-bb77-b358f4546763): <code>1GKnevUnVaQM2pQieMyeHkpr8DXfkpfAtL</code></br>
+- <img src="https://pi-hole.github.io/graphics/Badges/bitcoin-badge-black.svg" width="24" height="24" alt="BTC"/> [Bitcoin Cash](https://commerce.coinbase.com/checkout/fb7facaf-bebd-46be-bb77-b358f4546763): <code>qqh25hlmqaj99xraw00e47xmf8sysnyxhyww2d7dnh</code></br>
+- <img src="https://pi-hole.github.io/graphics/Badges/ethereum-badge-black.svg" width="24" height="24" alt="BTC"/> [Ethereum](https://commerce.coinbase.com/checkout/fb7facaf-bebd-46be-bb77-b358f4546763): <code>0xF00aF43d2431BAD585056492b310e48eC40D87e8</code>
+
+### Alternative support
+If you'd rather not [donate](https://pi-hole.net/donate/) (_which is okay!_), there are other ways you can help support us:
+
+- [Digital Ocean](http://www.digitalocean.com/?refcode=344d234950e1) _affiliate link_
+- [UNIXstickers.com](http://unixstickers.refr.cc/jacobs) _save $5 when you spend $9 using our affiliate link_
+- [Pi-hole Swag Store](https://pi-hole.net/shop/) _affiliate link_
+- [Amazon](http://www.amazon.com/exec/obidos/redirect-home/pihole09-20) _affiliate link_
+- [Ho-ost](https://clients.ho-ost.com/aff.php?aff=19) _save 50% with our affiliate link_
+- [DNS Made Easy](https://cp.dnsmadeeasy.com/u/133706) _affiliate link_
+- [Vultr](http://www.vultr.com/?ref=7190426) _affiliate link_
+- Spreading the word about our software, and how you have benefited from it
+
+### Contributing via GitHub
+We welcome _everyone_ to contribute to issue reports, suggest new features, and create pull requests.
+
+If you have something to add - anything from a typo through to a whole new feature, we're happy to check it out! Just make sure to fill out our template when submitting your request; the questions that it asks will help the volunteers quickly understand what you're aiming to achieve.
+
+### Presentations about Pi-hole
+Word-of-mouth continues to help our project grow immensely, and so we are helping make this easier for people.
+
+If you are going to be presenting Pi-hole at a conference, meetup or even a school project, [get in touch with us](https://pi-hole.net/2017/05/17/giving-a-presentation-on-pi-hole-contact-us-first-for-some-goodies-and-support/) so we can hook you up with free swag to hand out to your audience!
+
+-----
+
+## Getting in touch with us
+While we are primarily reachable on our <a href="https://discourse.pi-hole.net/">Discourse User Forum</a>, we can also be found on a variety of social media outlets. **Please be sure to check the FAQ's** before starting a new discussion, as we do not have the spare time to reply to every request for assistance.
+
+<ul>
+  <li><b><a href="https://discourse.pi-hole.net/c/faqs">Frequently Asked Questions</a></b></li>
+  <li><b><a href="https://github.com/pi-hole/pi-hole/wiki">Pi-hole Wiki</a></b></li>
+  <li><b><a href="https://discourse.pi-hole.net/c/feature-requests?order=votes">Feature Requests</a></b></li>
+  <li><a href="https://discourse.pi-hole.net/">Discourse User Forum</a></li>
+  <li><a href="https://www.reddit.com/r/pihole/">Reddit</a></li>
+  <li><a href="https://twitter.com/The_Pi_Hole">Twitter</a></li>
+  <li><a href="https://www.facebook.com/ThePiHole/">Facebook</a></li>
+  <li><a href="https://gitter.im/pi-hole/pi-hole">Gitter</a> (Real-time chat)</li>
+  <li><a href="https://www.youtube.com/channel/UCT5kq9w0wSjogzJb81C9U0w">YouTube</a></li>
+</ul>
+
+# Features
+
+## Mobile friendly interface
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/mobile-friendly.png" height="300" alt="Mobile friendly"></a>
+</p>
+
+## Password protection
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/password-protection.png" height="400" alt="Password protection"></a>
+</p>
+
+## Detailed graphs and doughnut charts
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/piecharts.png" alt="Pie charts"></a>
+</p>
+
+## Top lists of domains and clients
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/topdomains-clients.png" alt="Top domains/top clients"></a>
+</p>
+
+## A filterable and sortable query log
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/query-log-sorted.png" alt="Query log"></a>
+</p>
+
+## An audit log
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/audit-log.png" alt="Pi-hole Web interface"></a>
+</p>
+
+## Long Term Statistics to view data over user defined time ranges
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/long-term-stats.png" alt="Long-term stats"></a>
+</p>
+
+## A built-in debugger
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/debug.png" alt="Debugger"></a>
+</p>
+
+## Black and white lists
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/blacklist.png" alt="Blacklist"></a>
+</br></br>
+<img src="https://pi-hole.github.io/graphics/Screenshots/whitelist.png" alt="Whitelist"></a>
+</p>
+
+## The ability to easily manage and configure Pi-hole features
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/dashboard-pihole-repo.png" alt="Settings"></a>
+</p>
+
+## ... and all the main features of the Command Line Interface!
+<p align="center">
+<img src="https://pi-hole.github.io/graphics/Screenshots/pihole-t.png" alt="Tail the log"></a>
+</br></br>
+<img src="https://pi-hole.github.io/graphics/Screenshots/pihole-q.png" alt="Query ad lists"></a>
+</p>
 
 ## API
-A read-only API can be accessed at `/admin/api.php`. With either no parameters or `api.php?summary` it returns the following JSON:
+Full usage available [here](https://discourse.pi-hole.net/t/pi-hole-api/1863).  can be accessed at `/admin/api.php`. With either no parameters or `/admin/api.php?summary` it returns the following JSON:
 ```JSON
-{
-	"domains_being_blocked": "136,708",
-	"dns_queries_today": "18,108",
-	"ads_blocked_today": "14,648",
-	"ads_percentage_today": "80.9"
+{  
+   "domains_being_blocked":243038,
+   "dns_queries_today":2385,
+   "ads_blocked_today":414,
+   "ads_percentage_today":17.35849,
+   "unique_domains":429,
+   "queries_forwarded":1537,
+   "queries_cached":434,
+   "clients_ever_seen":5,
+   "unique_clients":5,
+   "status":"enabled"
 }
 ```
 
-There are many more parameters, such as `summaryRaw`, `overTimeData10mins`, `topItems`, ` topClients` or `getQuerySources`, `getQueryTypes`, `getForwardDestinations`, and finally `getAllQueries`.
-Together with a token it is also possible to enable and disable (also with a set timeout) blocking via the API
+[There are many more parameters](https://discourse.pi-hole.net/t/pi-hole-api/1863), such as:
 
-The API returns more information (in a slighly different format if `FTL` is running) - it supports a fall-back to the "old" PHP API if `FTL` is not running. Test the type and/or version of the API by using the parameter `type` and `version`.
+- `type & version`
+- `summaryRaw`
+- `summary`
+- `overTimeData10mins`
+- `topItems`
+- `getQuerySources`
+- `getForwardDestinations`
+- `getQueryTypes`
+- `getAllQueries`
+- `enable`
+- `disable`
+- `recentBlocked`
 
-<hr>
-<img src="https://assets.pi-hole.net/static/BStackLogo.png" height="80"><br>
-We use BrowserStack for multi-platform multi-browser testing.
+Together with a token it is also possible to [enable and disable (also with a set timeout) blocking via the API](https://discourse.pi-hole.net/t/is-there-an-api-command-to-disable-ad-blocking/7693).
+
+The API returns more information (in a slightly different format if `FTL` is running) - it supports a fall-back to the "old" PHP API if `FTL` is not running. Test the type and/or version of the API by using the parameter `type` and `version`.

From 5c8c6885dd9542e3d3c13733c2419adb174c2784 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacob.salmela@pi-hole.net>
Date: Fri, 23 Mar 2018 19:33:45 -0500
Subject: [PATCH 045/172] add settings gif

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 505edf19..57412759 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ While we are primarily reachable on our <a href="https://discourse.pi-hole.net/"
 
 ## The ability to easily manage and configure Pi-hole features
 <p align="center">
-<img src="https://pi-hole.github.io/graphics/Screenshots/dashboard-pihole-repo.png" alt="Settings"></a>
+<img src="https://pi-hole.github.io/graphics/Screenshots/dashboard-settings.gif" alt="Settings"></a>
 </p>
 
 ## ... and all the main features of the Command Line Interface!

From 44774d914c40cf4fae9ebd6af6dcf899a1c7abe2 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 10:20:26 +0200
Subject: [PATCH 046/172] We should split the string at ": " instead of at ":"
 to be fully compatible with IPv6 addresses

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 5e722325..4212cbb6 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1070,7 +1070,7 @@ var customTooltips = function(tooltip) {
                         style += '; border-color:' + colors.borderColor;
                         style += '; border-width: 2px';
                         var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
-                        var num = body[0].split(':');
+                        var num = body[0].split(': ');
                         if(num[1] > 0)
                         {
                             innerHtml += '<tr><td>' + span + body + '</td></tr>';

From 062ba5141bb5e17a679d611c224664bd7a448631 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 11:32:36 +0200
Subject: [PATCH 047/172] Strings must use doublequote

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 4212cbb6..1c52a18f 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1032,11 +1032,11 @@ $(document).ready(function() {
 
 var customTooltips = function(tooltip) {
         // Tooltip Element
-        var tooltipEl = document.getElementById('chartjs-tooltip');
+        var tooltipEl = document.getElementById("chartjs-tooltip");
         if (!tooltipEl) {
-                tooltipEl = document.createElement('div');
-                tooltipEl.id = 'chartjs-tooltip';
-                tooltipEl.innerHTML = '<table></table>';
+                tooltipEl = document.createElement("div");
+                tooltipEl.id = "chartjs-tooltip";
+                tooltipEl.innerHTML = "<table></table>";
                 document.body.appendChild(tooltipEl);
         }
         // Hide if no tooltip
@@ -1045,11 +1045,11 @@ var customTooltips = function(tooltip) {
                 return;
         }
         // Set caret Position
-        tooltipEl.classList.remove('above', 'below', 'no-transform');
+        tooltipEl.classList.remove("above", "below", "no-transform");
         if (tooltip.yAlign) {
                 tooltipEl.classList.add(tooltip.yAlign);
         } else {
-                tooltipEl.classList.add('above');
+                tooltipEl.classList.add("above");
         }
         function getBody(bodyItem) {
                 return bodyItem.lines;
@@ -1058,31 +1058,31 @@ var customTooltips = function(tooltip) {
         if (tooltip.body) {
                 var titleLines = tooltip.title || [];
                 var bodyLines = tooltip.body.map(getBody);
-                var innerHtml = '<thead>';
+                var innerHtml = "<thead>";
                 titleLines.forEach(function(title) {
-                        innerHtml += '<tr><th>' + title + '</th></tr>';
+                        innerHtml += "<tr><th>" + title + "</th></tr>";
                 });
-                innerHtml += '</thead><tbody>';
+                innerHtml += "</thead><tbody>";
                 var printed = 0;
                 bodyLines.forEach(function(body, i) {
                         var colors = tooltip.labelColors[i];
-                        var style = 'background:' + colors.backgroundColor;
-                        style += '; border-color:' + colors.borderColor;
-                        style += '; border-width: 2px';
-                        var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
-                        var num = body[0].split(': ');
+                        var style = "background:" + colors.backgroundColor;
+                        style += "; border-color:" + colors.borderColor;
+                        style += "; border-width: 2px";
+                        var span = "<span class="chartjs-tooltip-key" style="" + style + ""></span>";
+                        var num = body[0].split(": ");
                         if(num[1] > 0)
                         {
-                            innerHtml += '<tr><td>' + span + body + '</td></tr>';
+                            innerHtml += "<tr><td>" + span + body + "</td></tr>";
                             printed++;
                         }
                 });
                 if(printed < 1)
                 {
-                    innerHtml += '<tr><td>No activity recorded</td></tr>';
+                    innerHtml += "<tr><td>No activity recorded</td></tr>";
                 }
-                innerHtml += '</tbody>';
-                var tableRoot = tooltipEl.querySelector('table');
+                innerHtml += "</tbody>";
+                var tableRoot = tooltipEl.querySelector("table");
                 tableRoot.innerHTML = innerHtml;
         }
 
@@ -1096,9 +1096,9 @@ var customTooltips = function(tooltip) {
         }
         tooltipEl.style.opacity = 1;
         tooltipEl.style.left = position.left + width + "px";
-        tooltipEl.style.top = position.top + tooltip.caretY + 'px';
+        tooltipEl.style.top = position.top + tooltip.caretY + "px";
         tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
-        tooltipEl.style.fontSize = tooltip.bodyFontSize + 'px';
+        tooltipEl.style.fontSize = tooltip.bodyFontSize + "px";
         tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
-        tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
+        tooltipEl.style.padding = tooltip.yPadding + "px " + tooltip.xPadding + "px";
 };

From 517fa24fe387bd4589b70d5a48751055bc44e99c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 13:44:48 +0200
Subject: [PATCH 048/172] Show "N/A" for queries where the reply has not yet
 reached the Pi-hole

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index fbfb9a0e..d4c469b2 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -218,7 +218,11 @@ $(document).ready(function() {
             if(data.length > 6 && !blocked)
             {
                 $("td:eq(5)", row).css("color","black");
-                if (data[6] === "1")
+                if (data[6] === "0")
+                {
+                    $("td:eq(5)", row).html("N/A");
+                }
+                else if (data[6] === "1")
                 {
                     $("td:eq(5)", row).html("NODATA-" + data[1]);
                 }

From 2aca7bf7642b2c7c1513e27801bb4044c61b6a0d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 14:00:02 +0200
Subject: [PATCH 049/172] customTooltips must be defined before used

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 146 ++++++++++++++++++------------------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 1c52a18f..385c3da3 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -29,6 +29,79 @@ function objectToArray(p){
     return [idx,arr];
 }
 
+var customTooltips = function(tooltip) {
+        // Tooltip Element
+        var tooltipEl = document.getElementById("chartjs-tooltip");
+        if (!tooltipEl) {
+                tooltipEl = document.createElement("div");
+                tooltipEl.id = "chartjs-tooltip";
+                tooltipEl.innerHTML = "<table></table>";
+                document.body.appendChild(tooltipEl);
+        }
+        // Hide if no tooltip
+        if (tooltip.opacity === 0) {
+                tooltipEl.style.opacity = 0;
+                return;
+        }
+        // Set caret Position
+        tooltipEl.classList.remove("above", "below", "no-transform");
+        if (tooltip.yAlign) {
+                tooltipEl.classList.add(tooltip.yAlign);
+        } else {
+                tooltipEl.classList.add("above");
+        }
+        function getBody(bodyItem) {
+                return bodyItem.lines;
+        }
+        // Set Text
+        if (tooltip.body) {
+                var titleLines = tooltip.title || [];
+                var bodyLines = tooltip.body.map(getBody);
+                var innerHtml = "<thead>";
+                titleLines.forEach(function(title) {
+                        innerHtml += "<tr><th>" + title + "</th></tr>";
+                });
+                innerHtml += "</thead><tbody>";
+                var printed = 0;
+                bodyLines.forEach(function(body, i) {
+                        var colors = tooltip.labelColors[i];
+                        var style = "background:" + colors.backgroundColor;
+                        style += "; border-color:" + colors.borderColor;
+                        style += "; border-width: 2px";
+                        var span = "<span class="chartjs-tooltip-key" style="" + style + ""></span>";
+                        var num = body[0].split(": ");
+                        if(num[1] > 0)
+                        {
+                            innerHtml += "<tr><td>" + span + body + "</td></tr>";
+                            printed++;
+                        }
+                });
+                if(printed < 1)
+                {
+                    innerHtml += "<tr><td>No activity recorded</td></tr>";
+                }
+                innerHtml += "</tbody>";
+                var tableRoot = tooltipEl.querySelector("table");
+                tableRoot.innerHTML = innerHtml;
+        }
+
+        // Display, position, and set styles for font
+        var position = this._chart.canvas.getBoundingClientRect();
+        var width = tooltip.caretX;
+        // Prevent compression of the tooltip at the right edge of the screen
+        if($(document).width() - tooltip.caretX < 400)
+        {
+                width = $(document).width()-400;
+        }
+        tooltipEl.style.opacity = 1;
+        tooltipEl.style.left = position.left + width + "px";
+        tooltipEl.style.top = position.top + tooltip.caretY + "px";
+        tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
+        tooltipEl.style.fontSize = tooltip.bodyFontSize + "px";
+        tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
+        tooltipEl.style.padding = tooltip.yPadding + "px " + tooltip.xPadding + "px";
+};
+
 // Functions to update data in page
 
 var failures = 0;
@@ -1029,76 +1102,3 @@ $(document).ready(function() {
         updateForwardDestinationsPie();
     }
 });
-
-var customTooltips = function(tooltip) {
-        // Tooltip Element
-        var tooltipEl = document.getElementById("chartjs-tooltip");
-        if (!tooltipEl) {
-                tooltipEl = document.createElement("div");
-                tooltipEl.id = "chartjs-tooltip";
-                tooltipEl.innerHTML = "<table></table>";
-                document.body.appendChild(tooltipEl);
-        }
-        // Hide if no tooltip
-        if (tooltip.opacity === 0) {
-                tooltipEl.style.opacity = 0;
-                return;
-        }
-        // Set caret Position
-        tooltipEl.classList.remove("above", "below", "no-transform");
-        if (tooltip.yAlign) {
-                tooltipEl.classList.add(tooltip.yAlign);
-        } else {
-                tooltipEl.classList.add("above");
-        }
-        function getBody(bodyItem) {
-                return bodyItem.lines;
-        }
-        // Set Text
-        if (tooltip.body) {
-                var titleLines = tooltip.title || [];
-                var bodyLines = tooltip.body.map(getBody);
-                var innerHtml = "<thead>";
-                titleLines.forEach(function(title) {
-                        innerHtml += "<tr><th>" + title + "</th></tr>";
-                });
-                innerHtml += "</thead><tbody>";
-                var printed = 0;
-                bodyLines.forEach(function(body, i) {
-                        var colors = tooltip.labelColors[i];
-                        var style = "background:" + colors.backgroundColor;
-                        style += "; border-color:" + colors.borderColor;
-                        style += "; border-width: 2px";
-                        var span = "<span class="chartjs-tooltip-key" style="" + style + ""></span>";
-                        var num = body[0].split(": ");
-                        if(num[1] > 0)
-                        {
-                            innerHtml += "<tr><td>" + span + body + "</td></tr>";
-                            printed++;
-                        }
-                });
-                if(printed < 1)
-                {
-                    innerHtml += "<tr><td>No activity recorded</td></tr>";
-                }
-                innerHtml += "</tbody>";
-                var tableRoot = tooltipEl.querySelector("table");
-                tableRoot.innerHTML = innerHtml;
-        }
-
-        // Display, position, and set styles for font
-        var position = this._chart.canvas.getBoundingClientRect();
-        var width = tooltip.caretX;
-        // Prevent compression of the tooltip at the right edge of the screen
-        if($(document).width() - tooltip.caretX < 400)
-        {
-        	width = $(document).width()-400;
-        }
-        tooltipEl.style.opacity = 1;
-        tooltipEl.style.left = position.left + width + "px";
-        tooltipEl.style.top = position.top + tooltip.caretY + "px";
-        tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
-        tooltipEl.style.fontSize = tooltip.bodyFontSize + "px";
-        tooltipEl.style.fontStyle = tooltip._bodyFontStyle;
-        tooltipEl.style.padding = tooltip.yPadding + "px " + tooltip.xPadding + "px";
-};

From 7bf5207e060445df7796c794c3174dec1b61ea79 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 18:39:03 +0200
Subject: [PATCH 050/172] Fix JS error

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 385c3da3..b52aeaa4 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -68,7 +68,7 @@ var customTooltips = function(tooltip) {
                         var style = "background:" + colors.backgroundColor;
                         style += "; border-color:" + colors.borderColor;
                         style += "; border-width: 2px";
-                        var span = "<span class="chartjs-tooltip-key" style="" + style + ""></span>";
+                        var span = "<span class=\"chartjs-tooltip-key\" style=\"" + style +  "\"></span>";
                         var num = body[0].split(": ");
                         if(num[1] > 0)
                         {

From 27d40465cdb05f9a4c817ca240624aabf991f346 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 18:48:23 +0200
Subject: [PATCH 051/172] Use jQuery's .html() routine to overwrite element's
 content

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index b52aeaa4..ae7f52d9 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -35,8 +35,8 @@ var customTooltips = function(tooltip) {
         if (!tooltipEl) {
                 tooltipEl = document.createElement("div");
                 tooltipEl.id = "chartjs-tooltip";
-                tooltipEl.innerHTML = "<table></table>";
                 document.body.appendChild(tooltipEl);
+                $("#chartjs-tooltip").html("<table></table>");
         }
         // Hide if no tooltip
         if (tooltip.opacity === 0) {
@@ -57,7 +57,7 @@ var customTooltips = function(tooltip) {
         if (tooltip.body) {
                 var titleLines = tooltip.title || [];
                 var bodyLines = tooltip.body.map(getBody);
-                var innerHtml = "<thead>";
+                var innerHtml = "<table><thead>";
                 titleLines.forEach(function(title) {
                         innerHtml += "<tr><th>" + title + "</th></tr>";
                 });
@@ -80,9 +80,8 @@ var customTooltips = function(tooltip) {
                 {
                     innerHtml += "<tr><td>No activity recorded</td></tr>";
                 }
-                innerHtml += "</tbody>";
-                var tableRoot = tooltipEl.querySelector("table");
-                tableRoot.innerHTML = innerHtml;
+                innerHtml += "</tbody></table>";
+                $("#chartjs-tooltip").html(innerHtml);
         }
 
         // Display, position, and set styles for font

From 5aba5a1314a251a6cc0dd339c0ea45c3e43a08e5 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 25 Mar 2018 18:49:15 +0200
Subject: [PATCH 052/172] Add missing semicolon

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index ae7f52d9..cfd51726 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -868,7 +868,7 @@ $(document).ready(function() {
                     mode: "x-axis",
                     custom: customTooltips,
                     itemSort: function(a, b) {
-                        return b.yLabel - a.yLabel
+                        return b.yLabel - a.yLabel;
                     },
                     callbacks: {
                         title: function(tooltipItem, data) {

From dca374bfcd30aaff1f348549b66530c5fb3f00ca Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 1 Apr 2018 16:39:54 +0200
Subject: [PATCH 053/172] Simplify NODATA reply type (no need to show A/AAAA
 here as we show that in the second column) and add reply time if available

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index d4c469b2..04c3a771 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -224,7 +224,7 @@ $(document).ready(function() {
                 }
                 else if (data[6] === "1")
                 {
-                    $("td:eq(5)", row).html("NODATA-" + data[1]);
+                    $("td:eq(5)", row).html("NODATA");
                 }
                 else if (data[6] === "2")
                 {
@@ -248,6 +248,11 @@ $(document).ready(function() {
                 $("td:eq(5)", row).css("color","black");
                 $("td:eq(5)", row).html("-");
             }
+            if(data.length > 7 && data[7] > 0)
+            {
+                var content = $("td:eq(5)", row).html();
+                $("td:eq(5)", row).html(content + " (" + (0.1*data[7]).toFixed(1)+"ms)");
+            }
 
         },
         dom: "<'row'<'col-sm-12'f>>" +

From 5e9c1aec9a117c699d99bcc13546a3c4677d0f63 Mon Sep 17 00:00:00 2001
From: Everett Southwick <everett@everettsouthwick.com>
Date: Sun, 1 Apr 2018 18:02:09 -0500
Subject: [PATCH 054/172] Add support for public Cloudflare DNS servers.

Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
---
 scripts/pi-hole/php/savesettings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index a17bc5f7..af8a90ec 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -123,7 +123,8 @@ function isinserverlist($addr) {
 			"Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"],
 			"Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"],
 			"DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"],
-			"Quad9" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"]
+			"Quad9" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe"],
+			"Cloudflare" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"]
 		];
 
 $adlist = [];

From 8b2e7b89ace329704e859d7475e7a2ab3fc24088 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 2 Apr 2018 14:28:48 +0200
Subject: [PATCH 055/172] Add separate legends for pie charts on the dashboard.
 Fixes #635

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php                   | 14 ++++++++++----
 scripts/pi-hole/js/index.js | 26 ++++++++++++++++++++++----
 style/pi-hole.css           | 28 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index c56266a4..3874380e 100644
--- a/index.php
+++ b/index.php
@@ -132,8 +132,11 @@ else
           <h3 class="box-title">Query Types (integrated)</h3>
         </div>
         <div class="box-body">
-          <div class="chart">
-            <canvas id="queryTypePieChart" width="400" height="150"></canvas>
+          <div class="float-left" style="width:50%">
+            <canvas id="queryTypePieChart" width="120" height="120"></canvas>
+          </div>
+          <div class="float-left" style="width:50%">
+            <div id="query-types-legend" class="chart-legend"></div>
           </div>
         </div>
         <div class="overlay">
@@ -148,8 +151,11 @@ else
           <h3 class="box-title">Forward Destinations (integrated)</h3>
         </div>
         <div class="box-body">
-          <div class="chart">
-            <canvas id="forwardDestinationPieChart" width="400" height="150"></canvas>
+          <div class="float-left" style="width:50%">
+            <canvas id="forwardDestinationPieChart" width="120" height="120"></canvas>
+          </div>
+          <div class="float-left" style="width:50%">
+            <div id="forward-destinations-legend" class="chart-legend"></div>
           </div>
         </div>
         <div class="overlay">
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 9f8cb8c6..7636ed9d 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -178,6 +178,16 @@ function updateQueryTypesPie() {
         queryTypePieChart.update();
         // Don't use rotation animation for further updates
         queryTypePieChart.options.animation.duration=0;
+        // Generate legend in separate div
+        $("#query-types-legend").html(queryTypePieChart.generateLegend());
+        $("#query-types-legend > ul > li").on("click",function(e){
+                $(this).toggleClass("strike");
+                var index = $(this).index();
+                var ci = e.view.queryTypePieChart;
+                var curr = ci.data.datasets[0]._meta[3].data[index];
+                curr.hidden = !curr.hidden;
+                ci.update();
+        });
     }).done(function() {
         // Reload graph after minute
         setTimeout(updateQueryTypesPie, 60000);
@@ -392,6 +402,16 @@ function updateForwardDestinationsPie() {
         forwardDestinationPieChart.update();
         // Don't use rotation animation for further updates
         forwardDestinationPieChart.options.animation.duration=0;
+        // Generate legend in separate div
+        $("#forward-destinations-legend").html(forwardDestinationPieChart.generateLegend());
+        $("#forward-destinations-legend > ul > li").on("click",function(e){
+                $(this).toggleClass("strike");
+                var index = $(this).index();
+                var ci = e.view.forwardDestinationPieChart;
+                var curr = ci.data.datasets[0]._meta[3].data[index];
+                curr.hidden = !curr.hidden;
+                ci.update();
+        });
     }).done(function() {
         // Reload graph after one minute
         setTimeout(updateForwardDestinationsPie, 60000);
@@ -960,8 +980,7 @@ $(document).ready(function() {
             },
             options: {
                 legend: {
-                    display: true,
-                    position: "right"
+                    display: false
                 },
                 tooltips: {
                     enabled: true,
@@ -998,8 +1017,7 @@ $(document).ready(function() {
             },
             options: {
                 legend: {
-                    display: true,
-                    position: "right"
+                    display: false
                 },
                 tooltips: {
                     enabled: true,
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 541d5c6e..59389e9e 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -115,3 +115,31 @@ a.lookatme {
     -webkit-animation: fa-spin 1s infinite linear;
     animation: fa-spin 1s infinite linear;
 }
+
+.chart-legend {
+    height:250px;
+    overflow:auto;
+}
+
+.chart-legend ul {
+    list-style-type: none;
+}
+
+.chart-legend li {
+    cursor:pointer;
+}
+
+.chart-legend li span {
+    display: inline-block;
+    width: 20px;
+    height: 12px;
+    margin-right: 5px;
+}
+
+.strike {
+    text-decoration: line-through !important;
+}
+
+.float-left{
+    float:left;
+}

From e5e956ace65c29d6f59ed1270611fd8a21b022df Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 2 Apr 2018 22:07:07 +0200
Subject: [PATCH 056/172] Automatically detect which _meta to use

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 7636ed9d..75b275b5 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -184,8 +184,12 @@ function updateQueryTypesPie() {
                 $(this).toggleClass("strike");
                 var index = $(this).index();
                 var ci = e.view.queryTypePieChart;
-                var curr = ci.data.datasets[0]._meta[3].data[index];
-                curr.hidden = !curr.hidden;
+                var meta = ci.data.datasets[0]._meta;
+                for(let i in meta)
+                {
+                    var curr = meta[i].data[index];
+                    curr.hidden = !curr.hidden;
+                }
                 ci.update();
         });
     }).done(function() {
@@ -408,8 +412,12 @@ function updateForwardDestinationsPie() {
                 $(this).toggleClass("strike");
                 var index = $(this).index();
                 var ci = e.view.forwardDestinationPieChart;
-                var curr = ci.data.datasets[0]._meta[3].data[index];
-                curr.hidden = !curr.hidden;
+                var meta = ci.data.datasets[0]._meta;
+                for(let i in meta)
+                {
+                    var curr = meta[i].data[index];
+                    curr.hidden = !curr.hidden;
+                }
                 ci.update();
         });
     }).done(function() {

From 4cf0f4d6ff9ae4abace3555b696a1ebc33891dbe Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 2 Apr 2018 22:29:38 +0200
Subject: [PATCH 057/172] Make sure the properties exist when looping over
 objects

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 75b275b5..f9452cbd 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -187,8 +187,11 @@ function updateQueryTypesPie() {
                 var meta = ci.data.datasets[0]._meta;
                 for(let i in meta)
                 {
-                    var curr = meta[i].data[index];
-                    curr.hidden = !curr.hidden;
+                    if ({}.hasOwnProperty.call(meta, i))
+                    {
+                        var curr = meta[i].data[index];
+                        curr.hidden = !curr.hidden;
+                    }
                 }
                 ci.update();
         });
@@ -415,8 +418,11 @@ function updateForwardDestinationsPie() {
                 var meta = ci.data.datasets[0]._meta;
                 for(let i in meta)
                 {
-                    var curr = meta[i].data[index];
-                    curr.hidden = !curr.hidden;
+                    if ({}.hasOwnProperty.call(meta, i))
+                    {
+                        var curr = meta[i].data[index];
+                        curr.hidden = !curr.hidden;
+                    }
                 }
                 ci.update();
         });

From 7244e3a9e0db9add9240498246399b6a4aa3c945 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Mon, 2 Apr 2018 17:43:19 -0400
Subject: [PATCH 058/172] Don't search for the element by ID when we already
 have it

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/js/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index cfd51726..98376e79 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -36,7 +36,7 @@ var customTooltips = function(tooltip) {
                 tooltipEl = document.createElement("div");
                 tooltipEl.id = "chartjs-tooltip";
                 document.body.appendChild(tooltipEl);
-                $("#chartjs-tooltip").html("<table></table>");
+                $(tooltipEl).html("<table></table>");
         }
         // Hide if no tooltip
         if (tooltip.opacity === 0) {
@@ -81,7 +81,7 @@ var customTooltips = function(tooltip) {
                     innerHtml += "<tr><td>No activity recorded</td></tr>";
                 }
                 innerHtml += "</tbody></table>";
-                $("#chartjs-tooltip").html(innerHtml);
+                $(tooltipEl).html(innerHtml);
         }
 
         // Display, position, and set styles for font

From 6e99e1daaf91e870d12588a8c39609653e96754e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 3 Apr 2018 10:19:33 +0200
Subject: [PATCH 059/172] Remove old privacy settings from FTLDNS branch as
 they are superseded by FTL's new privacy levels which take action momentarily
 and don't require a restart of the resolver. Settings for them still have to
 be implemented on the dashboard.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/settings.php b/settings.php
index b2b264a6..129f5e76 100644
--- a/settings.php
+++ b/settings.php
@@ -844,10 +844,10 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                         <tr>
                                                           <div class="input-group">
                                                             <td>
-                                                              <input type="text" name="conditionalForwardingIP" class="form-control" data-inputmask="'alias': 'ip'" data-mask 
+                                                              <input type="text" name="conditionalForwardingIP" class="form-control" data-inputmask="'alias': 'ip'" data-mask
                                                               <?php if(isset($conditionalForwardingIP)){ ?>value="<?php echo $conditionalForwardingIP; ?>"<?php } ?>>
                                                             </td>
-                                                            <td><input type="text" name="conditionalForwardingDomain" class="form-control" data-mask 
+                                                            <td><input type="text" name="conditionalForwardingDomain" class="form-control" data-mask
                                                               <?php if(isset($conditionalForwardingDomain)){ ?>value="<?php echo $conditionalForwardingDomain; ?>"<?php } ?>>
                                                             </td>
                                                           </div>
@@ -911,43 +911,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row">
-                                            <div class="col-lg-12">
-                                                <h4>Privacy settings (Statistics / Query Log)</h4>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-lg-6">
-                                                <div class="form-group">
-                                                    <div class="checkbox">
-                                                        <label><input type="checkbox" name="querylog-permitted"
-                                                                      <?php if ($queryLog === "permittedonly" || $queryLog === "all"){ ?>checked<?php }
-                                                                      ?>>Show permitted domain entries</label>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-6">
-                                                <div class="form-group">
-                                                    <div class="checkbox">
-                                                        <label><input type="checkbox" name="querylog-blocked"
-                                                                      <?php if ($queryLog === "blockedonly" || $queryLog === "all"){ ?>checked<?php }
-                                                                      ?>>Show blocked domain entries</label>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-lg-12">
-                                                <h4>Privacy mode</h4>
-                                                <div class="form-group">
-                                                    <div class="checkbox">
-                                                        <label><input type="checkbox" name="privacyMode"
-                                                                      <?php if ($privacyMode){ ?>checked<?php }
-                                                                      ?>>Don't show origin of DNS requests in query log</label>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
                                     </div>
                                     <div class="box-footer clearfix">
                                         <input type="hidden" name="field" value="API">

From 71a7c84cba874b6c931506302dd16db4fee1c679 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 12:32:55 +0200
Subject: [PATCH 060/172] Make second argument of resolveHostname() optional

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php                 | 2 +-
 scripts/pi-hole/php/FTL.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index 95a39c38..c8fa7511 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -309,7 +309,7 @@ if (isset($_GET['getClientNames']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$forward_dest[resolveHostname($tmp[2])] = floatval($tmp[1]);
+		$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
 	}
 
 	$result = array('clients' => $forward_dest);
diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 0f6d9a3a..01f05575 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -140,7 +140,7 @@ function disconnectFTL($quiet=true)
 }
 
 $clients = array();
-function resolveHostname($clientip, $printIP)
+function resolveHostname($clientip, $printIP = false)
 {
 	global $clients;
 	$ipaddr = strtolower($clientip);

From 1055ccf4a31cd081edbe7565738566878fb50318 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 14:20:19 +0200
Subject: [PATCH 061/172] Add privacy level tab to Settings page

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 14 +++++-
 settings.php                         | 71 +++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index af8a90ec..aa8d0a84 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -256,7 +256,7 @@ function readAdlists()
 						$extra .= " conditional_forwarding ".$_POST["conditionalForwardingIP"]." ".$_POST["conditionalForwardingDomain"]." $reverseAddress";
 					}
 				}
-				
+
 				// Check if DNSinterface is set
 				if(isset($_POST["DNSinterface"]))
 				{
@@ -635,7 +635,19 @@ function readAdlists()
 
 				// Reread available adlists
 				$adlist = readAdlists();
+				break;
 
+			case "privacyLevel":
+				$level = intval($_POST["privacylevel"]);
+				if($level >= 0 && $level <= 3)
+				{
+					exec("sudo pihole -a privacylevel ".$level);
+					$success .= "The privacy level has been updated";
+				}
+				else
+				{
+					$error .= "Invalid privacy level (".$level.")!";
+				}
 				break;
 
 			default:
diff --git a/settings.php b/settings.php
index 129f5e76..34c40b68 100644
--- a/settings.php
+++ b/settings.php
@@ -9,6 +9,15 @@ require "scripts/pi-hole/php/header.php";
 require "scripts/pi-hole/php/savesettings.php";
 // Reread ini file as things might have been changed
 $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
+$piholeFTLConfFile = "/etc/pihole/pihole-FTL.conf";
+if(is_readable($piholeFTLConfFile))
+{
+	$piholeFTLConf = parse_ini_file($piholeFTLConfFile);
+}
+else
+{
+	$piholeFTLConf = array();
+}
 
 ?>
 <style type="text/css">
@@ -230,7 +239,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
 ?>
 
 <?php
-if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", "api", "teleporter"))) {
+if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", "api", "privacy", "teleporter"))) {
     $tab = $_GET['tab'];
 } else {
     $tab = "sysadmin";
@@ -245,6 +254,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                 <li<?php if($tab === "dns"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#dns">DNS</a></li>
                 <li<?php if($tab === "piholedhcp"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#piholedhcp">DHCP</a></li>
                 <li<?php if($tab === "api"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#api">API / Web interface</a></li>
+                <li<?php if($tab === "privacy"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#privacy">Privacy</a></li>
                 <li<?php if($tab === "teleporter"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#teleporter">Teleporter</a></li>
             </ul>
             <div class="tab-content">
@@ -874,7 +884,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                 } else {
                     $temperatureunit = "C";
                 }
-                // Use $boxedlayout value determined in header.php
                 ?>
                 <div id="api" class="tab-pane fade<?php if($tab === "api"){ ?> in active<?php } ?>">
                     <div class="row">
@@ -969,6 +978,64 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                         </div>
                     </div>
                 </div>
+                <!-- ######################################################### Privacy (may be expanded further later on) ######################################################### -->
+                <?php
+                // Get privacy level from piholeFTL config array
+                if (isset($piholeFTLConf["PRIVACYLEVEL"])) {
+                    $privacylevel = intval($piholeFTLConf["PRIVACYLEVEL"]);
+                } else {
+                    $privacylevel = 0;
+                }
+                ?>
+                <div id="privacy" class="tab-pane fade<?php if($tab === "privacy"){ ?> in active<?php } ?>">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <form role="form" method="post">
+                                <div class="box box-warning">
+                                    <div class="box-header with-border">
+                                        <h3 class="box-title">Privacy settings</h3>
+                                    </div>
+                                    <div class="box-body">
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <h4>DNS resolver privacy level</h4>
+                                                <p>Specify if DNS queries should be anonymized, available options are:
+                                                <div class="form-group">
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="privacylevel" value="0"
+                                                                      <?php if ($privacylevel === 0){ ?>checked<?php }
+                                                                      ?>>Show everything: Record everything<br>Gives maximum amount of statistics</label>
+                                                    </div>
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="privacylevel" value="1"
+                                                                      <?php if ($privacylevel === 1){ ?>checked<?php }
+                                                                      ?>>Hide domains: Display and store all domains as "hidden"<br>This disables the Top Domains and Top Ads tables on the dashboard</label>
+                                                    </div>
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="privacylevel" value="2"
+                                                                      <?php if ($privacylevel === 2){ ?>checked<?php }
+                                                                      ?>>Hide domains and clients: Display and store all domains as "hidden" and all clients as "::1"<br>This disables all tables on the dashboard</label>
+                                                    </div>
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="privacylevel" value="3"
+                                                                      <?php if ($privacylevel === 3){ ?>checked<?php }
+                                                                      ?>>Paranoia mode: This disables basically everything except the live anonymous stastics<br>No history is saved at all to the database, and nothing is shown in the query log. Also, there are no top item lists.</label>
+                                                    </div>
+                                                </div>
+                                                <p>The privacy level may be changed at any time without having to restart the DNS resolver. However, note that queries with (partially) hidden details cannot be disclosed with a subsequent reduction of the privacy level.</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="box-footer clearfix">
+                                        <input type="hidden" name="field" value="privacyLevel">
+                                        <input type="hidden" name="token" value="<?php echo $token ?>">
+                                        <button type="submit" class="btn btn-primary pull-right">Apply</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
                 <!-- ######################################################### Teleporter ######################################################### -->
                 <div id="teleporter" class="tab-pane fade<?php if($tab === "teleporter"){ ?> in active<?php } ?>">
                     <div class="row">

From 634fa7f2b33a7d9222003d2a686586f7075c6d25 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 14:22:35 +0200
Subject: [PATCH 062/172] Remove top clients table if no data is returned
 (privacy mode!)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index f9452cbd..17d80492 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -488,6 +488,12 @@ function updateTopClientsChart() {
 
         }
 
+        // Remove table if there are no results (e.g. privacy mode enabled)
+        if(jQuery.isEmptyObject(data.top_sources))
+        {
+            $("#client-frequency").parent().remove();
+        }
+
         $("#client-frequency .overlay").hide();
         // Update top clients list data every ten seconds
         setTimeout(updateTopClientsChart, 10000);

From 081afa49240ea4b82b2e5aaf857f561c8d4d7c23 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 14:24:59 +0200
Subject: [PATCH 063/172] Remove clients over time graph if no data is returned
 (privacy mode!)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 17d80492..b942f352 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -294,6 +294,13 @@ function updateClientsOverTime() {
 
         // convert received objects to arrays
         data.over_time = objectToArray(data.over_time);
+
+        // Remove graph if there are no results (e.g. privacy mode enabled)
+        if(jQuery.isEmptyObject(data.over_time))
+        {
+            $("#clients").parent().remove();
+            return;
+        }
         // remove last data point since it not representative
         data.over_time[0].splice(-1,1);
         var timestamps = data.over_time[0];
@@ -492,6 +499,7 @@ function updateTopClientsChart() {
         if(jQuery.isEmptyObject(data.top_sources))
         {
             $("#client-frequency").parent().remove();
+            return;
         }
 
         $("#client-frequency .overlay").hide();
@@ -535,6 +543,7 @@ function updateTopLists() {
         if(jQuery.isEmptyObject(data.top_queries))
         {
             $("#domain-frequency").parent().remove();
+            return;
         }
 
         for (domain in data.top_ads) {
@@ -558,6 +567,7 @@ function updateTopLists() {
         if(jQuery.isEmptyObject(data.top_ads))
         {
             $("#ad-frequency").parent().remove();
+            return;
         }
 
         $("#domain-frequency .overlay").hide();

From 4fee31c7d55861ef029524fbb6d36e623bc02f26 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 14:28:38 +0200
Subject: [PATCH 064/172] Minor grammar change

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 34c40b68..3903b175 100644
--- a/settings.php
+++ b/settings.php
@@ -1004,7 +1004,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                     <div class="radio">
                                                         <label><input type="radio" name="privacylevel" value="0"
                                                                       <?php if ($privacylevel === 0){ ?>checked<?php }
-                                                                      ?>>Show everything: Record everything<br>Gives maximum amount of statistics</label>
+                                                                      ?>>Show everything and record everything<br>Gives maximum amount of statistics</label>
                                                     </div>
                                                     <div class="radio">
                                                         <label><input type="radio" name="privacylevel" value="1"

From 02ca09055367ea1a1284425cc239ad9bbbe47ba7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Apr 2018 14:32:11 +0200
Subject: [PATCH 065/172] We set clients to "0.0.0.0" for privacy levels higher
 then PRIVACY_HIDE_DOMAINS_CLIENTS

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 3903b175..bdfad4a3 100644
--- a/settings.php
+++ b/settings.php
@@ -1014,7 +1014,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                     <div class="radio">
                                                         <label><input type="radio" name="privacylevel" value="2"
                                                                       <?php if ($privacylevel === 2){ ?>checked<?php }
-                                                                      ?>>Hide domains and clients: Display and store all domains as "hidden" and all clients as "::1"<br>This disables all tables on the dashboard</label>
+                                                                      ?>>Hide domains and clients: Display and store all domains as "hidden" and all clients as "0.0.0.0"<br>This disables all tables on the dashboard</label>
                                                     </div>
                                                     <div class="radio">
                                                         <label><input type="radio" name="privacylevel" value="3"

From 65addb0114ddc66050e7ed8d5d097a5e92f5fb55 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 8 Apr 2018 13:16:19 +0200
Subject: [PATCH 066/172] Add cache-control meta tag to reduce problems with
 stalled browser caches

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/header.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 7261ef4b..65cab3f7 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -167,6 +167,7 @@
     <title>Pi-hole Admin Console</title>
     <!-- Usually browsers proactively perform domain name resolution on links that the user may choose to follow. We disable DNS prefetching here -->
     <meta http-equiv="x-dns-prefetch-control" content="off">
+    <meta http-equiv="cache-control" content="max-age=60,private">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <link rel="shortcut icon" href="img/favicon.png" type="image/x-icon" />

From 8fffc4e89a6a4123740bad217b008519730dafda Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 11 Apr 2018 18:31:15 +0200
Subject: [PATCH 067/172] Use host names returned by FTLDNS instead of trying
 to obtain them in PHP

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index c8fa7511..7f1ad096 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -155,7 +155,10 @@ if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$top_clients[resolveHostname($tmp[2],true)] = intval($tmp[1]);
+		if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+			$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
+		else
+			$top_clients[$tmp[2]] = intval($tmp[1]);
 	}
 
 	$result = array('top_sources' => $top_clients);
@@ -177,7 +180,10 @@ if (isset($_GET['getForwardDestinations']) && $auth)
 	foreach($return as $line)
 	{
 		$tmp = explode(" ",$line);
-		$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
+		if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+			$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
+		else
+			$forward_dest[$tmp[2]] = floatval($tmp[1]);
 	}
 
 	$result = array('forward_destinations' => $forward_dest);

From 2be54bc17acb8e48083b782d59c9b043fc707944 Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Fri, 13 Apr 2018 20:33:11 +0100
Subject: [PATCH 068/172] Prevent tooltip from being hidden by sidebar

---
 scripts/pi-hole/js/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 98376e79..c918dc2e 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -92,6 +92,11 @@ var customTooltips = function(tooltip) {
         {
                 width = $(document).width()-400;
         }
+        // Prevent tooltip disapearing behind the sidebar
+        if(tooltip.caretX < 100)
+        {
+            width = 100;
+        }
         tooltipEl.style.opacity = 1;
         tooltipEl.style.left = position.left + width + "px";
         tooltipEl.style.top = position.top + tooltip.caretY + "px";

From a1824a45d43c7e9fc058b9eb539511ce2a8d4c85 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 10:56:52 +0200
Subject: [PATCH 069/172] Improve way PHP connects to FTL

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api.php                     |  13 +-
 api_FTL.php                 | 603 ++++++++++++++++++------------------
 scripts/pi-hole/php/FTL.php | 136 +-------
 3 files changed, 318 insertions(+), 434 deletions(-)

diff --git a/api.php b/api.php
index 4092540d..db94d735 100644
--- a/api.php
+++ b/api.php
@@ -75,20 +75,13 @@ elseif (isset($_GET['disable']) && $auth)
 }
 
 // Other API functions
-if(!testFTL($FTL_IP) && !isset($_GET["PHP"]))
+if(!isset($_GET["PHP"]))
 {
-	$data = array_merge($data, array("FTLnotrunning" => true));
+	require("api_FTL.php");
 }
 else
 {
-	if(!isset($_GET["PHP"]))
-	{
-		require("api_FTL.php");
-	}
-	else
-	{
-		require("api_PHP.php");
-	}
+	require("api_PHP.php");
 }
 
 if(isset($_GET["jsonForceObject"]))
diff --git a/api_FTL.php b/api_FTL.php
index 7f1ad096..e057a941 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -15,329 +15,336 @@ if(!isset($api))
 // $FTL_IP is defined in api.php
 $socket = connectFTL($FTL_IP);
 
-if (isset($_GET['type'])) {
-	$data["type"] = "FTL";
-}
-
-if (isset($_GET['version'])) {
-	$data["version"] = 3;
-}
-
-if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET))
+if(!is_resource($socket))
 {
-	sendRequestFTL("stats");
-	$return = getResponseFTL();
+	$data = array_merge($data, array("FTLnotrunning" => true));
+}
+else
+{
+	if (isset($_GET['type'])) {
+		$data["type"] = "FTL";
+	}
 
-	$stats = [];
-	foreach($return as $line)
+	if (isset($_GET['version'])) {
+		$data["version"] = 3;
+	}
+
+	if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET))
 	{
-		$tmp = explode(" ",$line);
+		sendRequestFTL("stats");
+		$return = getResponseFTL();
 
-		if(($tmp[0] === "domains_being_blocked" && !is_numeric($tmp[1])) || $tmp[0] === "status")
+		$stats = [];
+		foreach($return as $line)
 		{
-			$stats[$tmp[0]] = $tmp[1];
-			continue;
-		}
+			$tmp = explode(" ",$line);
 
-		if(isset($_GET['summary']))
-		{
-			if($tmp[0] !== "ads_percentage_today")
+			if(($tmp[0] === "domains_being_blocked" && !is_numeric($tmp[1])) || $tmp[0] === "status")
 			{
-				$stats[$tmp[0]] = number_format($tmp[1]);
+				$stats[$tmp[0]] = $tmp[1];
+				continue;
+			}
+
+			if(isset($_GET['summary']))
+			{
+				if($tmp[0] !== "ads_percentage_today")
+				{
+					$stats[$tmp[0]] = number_format($tmp[1]);
+				}
+				else
+				{
+					$stats[$tmp[0]] = number_format($tmp[1], 1, '.', '');
+				}
 			}
 			else
 			{
-				$stats[$tmp[0]] = number_format($tmp[1], 1, '.', '');
+				$stats[$tmp[0]] = floatval($tmp[1]);
 			}
 		}
-		else
+		$data = array_merge($data,$stats);
+	}
+
+	if (isset($_GET['overTimeData10mins']))
+	{
+		sendRequestFTL("overTime");
+		$return = getResponseFTL();
+
+		$domains_over_time = array();
+		$ads_over_time = array();
+		foreach($return as $line)
 		{
-			$stats[$tmp[0]] = floatval($tmp[1]);
+			$tmp = explode(" ",$line);
+			$domains_over_time[intval($tmp[0])] = intval($tmp[1]);
+			$ads_over_time[intval($tmp[0])] = intval($tmp[2]);
 		}
-	}
-	$data = array_merge($data,$stats);
-}
-
-if (isset($_GET['overTimeData10mins']))
-{
-	sendRequestFTL("overTime");
-	$return = getResponseFTL();
-
-	$domains_over_time = array();
-	$ads_over_time = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		$domains_over_time[intval($tmp[0])] = intval($tmp[1]);
-		$ads_over_time[intval($tmp[0])] = intval($tmp[2]);
-	}
-	$result = array('domains_over_time' => $domains_over_time,
-	                'ads_over_time' => $ads_over_time);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['topItems']) && $auth)
-{
-	if($_GET['topItems'] === "audit")
-	{
-		sendRequestFTL("top-domains for audit");
-	}
-	else if(is_numeric($_GET['topItems']))
-	{
-		sendRequestFTL("top-domains (".$_GET['topItems'].")");
-	}
-	else
-	{
-		sendRequestFTL("top-domains");
+		$result = array('domains_over_time' => $domains_over_time,
+		                'ads_over_time' => $ads_over_time);
+		$data = array_merge($data, $result);
 	}
 
-	$return = getResponseFTL();
-	$top_queries = array();
-	foreach($return as $line)
+	if (isset($_GET['topItems']) && $auth)
 	{
-		$tmp = explode(" ",$line);
-		$top_queries[$tmp[2]] = intval($tmp[1]);
-	}
-
-	if($_GET['topItems'] === "audit")
-	{
-		sendRequestFTL("top-ads for audit");
-	}
-	else if(is_numeric($_GET['topItems']))
-	{
-		sendRequestFTL("top-ads (".$_GET['topItems'].")");
-	}
-	else
-	{
-		sendRequestFTL("top-ads");
-	}
-
-	$return = getResponseFTL();
-	$top_ads = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		if(count($tmp) === 4)
-			$top_ads[$tmp[2]." (".$tmp[3].")"] = intval($tmp[1]);
-		else
-			$top_ads[$tmp[2]] = intval($tmp[1]);
-	}
-
-	$result = array('top_queries' => $top_queries,
-	                'top_ads' => $top_ads);
-
-	$data = array_merge($data, $result);
-}
-
-if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth)
-{
-
-	if(isset($_GET['topClients']))
-	{
-		$number = $_GET['topClients'];
-	}
-	elseif(isset($_GET['getQuerySources']))
-	{
-		$number = $_GET['getQuerySources'];
-	}
-
-	if(is_numeric($number))
-	{
-		sendRequestFTL("top-clients (".$number.")");
-	}
-	else
-	{
-		sendRequestFTL("top-clients");
-	}
-
-	$return = getResponseFTL();
-	$top_clients = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		if(count($tmp) > 2 && strlen($tmp[3]) > 0)
-			$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
-		else
-			$top_clients[$tmp[2]] = intval($tmp[1]);
-	}
-
-	$result = array('top_sources' => $top_clients);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['getForwardDestinations']) && $auth)
-{
-	if($_GET['getForwardDestinations'] === "unsorted")
-	{
-		sendRequestFTL("forward-dest unsorted");
-	}
-	else
-	{
-		sendRequestFTL("forward-dest");
-	}
-	$return = getResponseFTL();
-	$forward_dest = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		if(count($tmp) > 2 && strlen($tmp[3]) > 0)
-			$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
-		else
-			$forward_dest[$tmp[2]] = floatval($tmp[1]);
-	}
-
-	$result = array('forward_destinations' => $forward_dest);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['getQueryTypes']) && $auth)
-{
-	sendRequestFTL("querytypes");
-	$return = getResponseFTL();
-	$querytypes = array();
-	foreach($return as $ret)
-	{
-		$tmp = explode(": ",$ret);
-		$querytypes[$tmp[0]] = floatval($tmp[1]);
-	}
-
-	$result = array('querytypes' => $querytypes);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['getAllQueries']) && $auth)
-{
-	if(isset($_GET['from']) && isset($_GET['until']))
-	{
-		// Get limited time interval
-		sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']);
-	}
-	else if(isset($_GET['domain']))
-	{
-		// Get specific domain only
-		sendRequestFTL("getallqueries-domain ".$_GET['domain']);
-	}
-	else if(isset($_GET['client']))
-	{
-		// Get specific client only
-		sendRequestFTL("getallqueries-client ".$_GET['client']);
-	}
-	else if(is_numeric($_GET['getAllQueries']))
-	{
-		sendRequestFTL("getallqueries (".$_GET['getAllQueries'].")");
-	}
-	else
-	{
-		// Get all queries
-		sendRequestFTL("getallqueries");
-	}
-	$return = getResponseFTL();
-	$allQueries = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		$tmp[3] = resolveHostname($tmp[3],false);
-		array_push($allQueries,$tmp);
-	}
-
-	$result = array('data' => $allQueries);
-	$data = array_merge($data, $result);
-}
-
-if(isset($_GET["recentBlocked"]))
-{
-	sendRequestFTL("recentBlocked");
-	die(getResponseFTL()[0]);
-	unset($data);
-}
-
-if (isset($_GET['overTimeDataForwards']) && $auth)
-{
-	sendRequestFTL("ForwardedoverTime");
-	$return = getResponseFTL();
-	$over_time = array();
-
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		for ($i=0; $i < count($tmp)-1; $i++) {
-			$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
-		}
-	}
-	$result = array('over_time' => $over_time);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['getForwardDestinationNames']) && $auth)
-{
-	sendRequestFTL("forward-names");
-	$return = getResponseFTL();
-	$forward_dest = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		if(count($tmp) == 4)
+		if($_GET['topItems'] === "audit")
 		{
-			$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
+			sendRequestFTL("top-domains for audit");
+		}
+		else if(is_numeric($_GET['topItems']))
+		{
+			sendRequestFTL("top-domains (".$_GET['topItems'].")");
 		}
 		else
 		{
-			$forward_dest[$tmp[2]] = floatval($tmp[1]);
+			sendRequestFTL("top-domains");
 		}
-	}
 
-	$result = array('forward_destinations' => $forward_dest);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['overTimeDataQueryTypes']) && $auth)
-{
-	sendRequestFTL("QueryTypesoverTime");
-	$return = getResponseFTL();
-	$over_time = array();
-
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		for ($i=0; $i < count($tmp)-1; $i++) {
-			$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
+		$return = getResponseFTL();
+		$top_queries = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			$top_queries[$tmp[2]] = intval($tmp[1]);
 		}
-	}
-	$result = array('over_time' => $over_time);
-	$data = array_merge($data, $result);
-}
 
-if (isset($_GET['getClientNames']) && $auth)
-{
-	sendRequestFTL("client-names");
-	$return = getResponseFTL();
-	$forward_dest = array();
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
-	}
-
-	$result = array('clients' => $forward_dest);
-	$data = array_merge($data, $result);
-}
-
-if (isset($_GET['overTimeDataClients']) && $auth)
-{
-	sendRequestFTL("ClientsoverTime");
-	$return = getResponseFTL();
-	$over_time = array();
-
-	foreach($return as $line)
-	{
-		$tmp = explode(" ",$line);
-		for ($i=0; $i < count($tmp)-1; $i++) {
-			$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
+		if($_GET['topItems'] === "audit")
+		{
+			sendRequestFTL("top-ads for audit");
+		}
+		else if(is_numeric($_GET['topItems']))
+		{
+			sendRequestFTL("top-ads (".$_GET['topItems'].")");
+		}
+		else
+		{
+			sendRequestFTL("top-ads");
 		}
-	}
-	$result = array('over_time' => $over_time);
-	$data = array_merge($data, $result);
-}
 
-disconnectFTL();
+		$return = getResponseFTL();
+		$top_ads = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			if(count($tmp) === 4)
+				$top_ads[$tmp[2]." (".$tmp[3].")"] = intval($tmp[1]);
+			else
+				$top_ads[$tmp[2]] = intval($tmp[1]);
+		}
+
+		$result = array('top_queries' => $top_queries,
+		                'top_ads' => $top_ads);
+
+		$data = array_merge($data, $result);
+	}
+
+	if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth)
+	{
+
+		if(isset($_GET['topClients']))
+		{
+			$number = $_GET['topClients'];
+		}
+		elseif(isset($_GET['getQuerySources']))
+		{
+			$number = $_GET['getQuerySources'];
+		}
+
+		if(is_numeric($number))
+		{
+			sendRequestFTL("top-clients (".$number.")");
+		}
+		else
+		{
+			sendRequestFTL("top-clients");
+		}
+
+		$return = getResponseFTL();
+		$top_clients = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+				$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
+			else
+				$top_clients[$tmp[2]] = intval($tmp[1]);
+		}
+
+		$result = array('top_sources' => $top_clients);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['getForwardDestinations']) && $auth)
+	{
+		if($_GET['getForwardDestinations'] === "unsorted")
+		{
+			sendRequestFTL("forward-dest unsorted");
+		}
+		else
+		{
+			sendRequestFTL("forward-dest");
+		}
+		$return = getResponseFTL();
+		$forward_dest = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+				$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
+			else
+				$forward_dest[$tmp[2]] = floatval($tmp[1]);
+		}
+
+		$result = array('forward_destinations' => $forward_dest);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['getQueryTypes']) && $auth)
+	{
+		sendRequestFTL("querytypes");
+		$return = getResponseFTL();
+		$querytypes = array();
+		foreach($return as $ret)
+		{
+			$tmp = explode(": ",$ret);
+			$querytypes[$tmp[0]] = floatval($tmp[1]);
+		}
+
+		$result = array('querytypes' => $querytypes);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['getAllQueries']) && $auth)
+	{
+		if(isset($_GET['from']) && isset($_GET['until']))
+		{
+			// Get limited time interval
+			sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']);
+		}
+		else if(isset($_GET['domain']))
+		{
+			// Get specific domain only
+			sendRequestFTL("getallqueries-domain ".$_GET['domain']);
+		}
+		else if(isset($_GET['client']))
+		{
+			// Get specific client only
+			sendRequestFTL("getallqueries-client ".$_GET['client']);
+		}
+		else if(is_numeric($_GET['getAllQueries']))
+		{
+			sendRequestFTL("getallqueries (".$_GET['getAllQueries'].")");
+		}
+		else
+		{
+			// Get all queries
+			sendRequestFTL("getallqueries");
+		}
+		$return = getResponseFTL();
+		$allQueries = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			$tmp[3] = resolveHostname($tmp[3],false);
+			array_push($allQueries,$tmp);
+		}
+
+		$result = array('data' => $allQueries);
+		$data = array_merge($data, $result);
+	}
+
+	if(isset($_GET["recentBlocked"]))
+	{
+		sendRequestFTL("recentBlocked");
+		die(getResponseFTL()[0]);
+		unset($data);
+	}
+
+	if (isset($_GET['overTimeDataForwards']) && $auth)
+	{
+		sendRequestFTL("ForwardedoverTime");
+		$return = getResponseFTL();
+		$over_time = array();
+
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			for ($i=0; $i < count($tmp)-1; $i++) {
+				$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
+			}
+		}
+		$result = array('over_time' => $over_time);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['getForwardDestinationNames']) && $auth)
+	{
+		sendRequestFTL("forward-names");
+		$return = getResponseFTL();
+		$forward_dest = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			if(count($tmp) == 4)
+			{
+				$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
+			}
+			else
+			{
+				$forward_dest[$tmp[2]] = floatval($tmp[1]);
+			}
+		}
+
+		$result = array('forward_destinations' => $forward_dest);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['overTimeDataQueryTypes']) && $auth)
+	{
+		sendRequestFTL("QueryTypesoverTime");
+		$return = getResponseFTL();
+		$over_time = array();
+
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			for ($i=0; $i < count($tmp)-1; $i++) {
+				$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
+			}
+		}
+		$result = array('over_time' => $over_time);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['getClientNames']) && $auth)
+	{
+		sendRequestFTL("client-names");
+		$return = getResponseFTL();
+		$forward_dest = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
+		}
+
+		$result = array('clients' => $forward_dest);
+		$data = array_merge($data, $result);
+	}
+
+	if (isset($_GET['overTimeDataClients']) && $auth)
+	{
+		sendRequestFTL("ClientsoverTime");
+		$return = getResponseFTL();
+		$over_time = array();
+
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			for ($i=0; $i < count($tmp)-1; $i++) {
+				$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
+			}
+		}
+		$result = array('over_time' => $over_time);
+		$data = array_merge($data, $result);
+	}
+
+	disconnectFTL();
+}
 ?>
diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 01f05575..5ead329e 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -6,30 +6,8 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-function testFTL($address)
+function connectFTL($address, $port=4711)
 {
-	if($address === "127.0.0.1")
-	{
-		$ret = shell_exec("pidof pihole-FTL");
-		return intval($ret);
-	}
-	// We cannot relly test for a distant FTL instance
-	// in the same way, so for any other IP address
-	// we simply return true here and rely on the API
-	// socket connection itself to fail if there is nothing
-	// on that address
-	return true;
-}
-
-function connectFTL($address, $port=4711, $quiet=true)
-{
-	$timeout = 3;
-
-	if(!$quiet)
-	{
-		echo "Attempting to connect to '$address' on port '$port'...\n";
-	}
-
 	if($address == "127.0.0.1")
 	{
 		// Read port
@@ -38,136 +16,42 @@ function connectFTL($address, $port=4711, $quiet=true)
 			$port = intval($portfile);
 	}
 
-	// Create a TCP/IP socket
-	$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)
-	or die("socket_create() failed: reason: " . socket_strerror(socket_last_error()) . "\n");
-
-	socket_set_nonblock($socket) or die("Unable to set nonblock on socket\n");
-
-	$time = time();
-	while (!@socket_connect($socket, $address, $port))
-	{
-		$err = socket_last_error($socket);
-		if ($err == 115 || $err == 114)
-		{
-			if ((time() - $time) >= $timeout)
-			{
-				socket_close($socket);
-				die("Connection timed out.\n");
-			}
-			// Wait for 1 millisecond
-			usleep(1000);
-			continue;
-		}
-		die(socket_strerror($err) . "\n");
-	}
-
-	socket_set_block($socket) or die("Unable to set block on socket\n");
-
-	// Set timeout to 3 seconds
-	socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec'=>$timeout, 'usec'=>0]);
-	socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>$timeout, 'usec'=>0]);
-
-	if(!$quiet)
-	{
-		echo "Success!\n\n";
-	}
+	// Open Internet socket connection
+	$socket = @fsockopen($address, $port, $timeout = 1.0);
 
 	return $socket;
 }
-function sendRequestFTL($requestin, $quiet=true)
+function sendRequestFTL($requestin)
 {
 	global $socket;
 
 	$request = ">".$requestin;
-	if(!$quiet)
-	{
-		echo "Sending request (".$request.")...\n";
-	}
-
-	socket_write($socket, $request, strlen($request)) or die("Could not send data to server\n");
-	if(!$quiet)
-	{
-		echo "OK.\n";
-	}
+	fwrite($socket, $request) or die("Could not send data to server\n");
 }
 
-function getResponseFTL($quiet=true)
+function getResponseFTL()
 {
 	global $socket;
-	if(!$quiet)
-	{
-		echo "Reading response:\n";
-	}
 
 	$response = [];
 
 	while(true)
 	{
-		$out = socket_read($socket, 2048, PHP_NORMAL_READ);
-		if(!$quiet)
-		{
-			echo $out;
-		}
+		$out = fgets($socket, 128);
 		if(strrpos($out,"---EOM---") !== false)
-		{
 			break;
-		}
+
 		$out = rtrim($out);
 		if(strlen($out) > 0)
-		{
 			$response[] = $out;
-		}
 	}
 
 	return $response;
 }
 
-function disconnectFTL($quiet=true)
+function disconnectFTL()
 {
 	global $socket;
-	if(!$quiet)
-	{
-		echo "Closing socket...";
-	}
-
-	socket_close($socket);
-
-	if(!$quiet)
-	{
-		echo "OK.\n\n";
-	}
-}
-
-$clients = array();
-function resolveHostname($clientip, $printIP = false)
-{
-	global $clients;
-	$ipaddr = strtolower($clientip);
-	if(array_key_exists($clientip, $clients))
-	{
-		// Entry already exists
-		$clientname = $clients[$ipaddr];
-		if($printIP)
-			return $clientname."|".$clientip;
-		return $clientname;
-	}
-
-	else if(filter_var($clientip, FILTER_VALIDATE_IP))
-	{
-		// Get host name of client and convert to lower case
-		$clientname = strtolower(gethostbyaddr($ipaddr));
-	}
-	else
-	{
-		// This is already a host name
-		$clientname = $ipaddr;
-	}
-	// Buffer result
-	$clients[$ipaddr] = $clientname;
-
-	if($printIP)
-		return $clientname."|".$clientip;
-	return $clientname;
+	fclose($socket);
 }
 ?>

From ef948cfef3693be1cbe2c84803cebc11547aba0c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 11:23:55 +0200
Subject: [PATCH 070/172] Have to provide all optional arguments in PHP...

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/FTL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 5ead329e..705aa8de 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -17,7 +17,7 @@ function connectFTL($address, $port=4711)
 	}
 
 	// Open Internet socket connection
-	$socket = @fsockopen($address, $port, $timeout = 1.0);
+	$socket = @fsockopen($address, $port, $errno, $errstr, 1.0);
 
 	return $socket;
 }

From cd6684a37c271c101f4e7df226d7e838fe9572eb Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 11:26:15 +0200
Subject: [PATCH 071/172] Remove resolveHostname() in client-names

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index e057a941..7253e43c 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -317,14 +317,17 @@ else
 	{
 		sendRequestFTL("client-names");
 		$return = getResponseFTL();
-		$forward_dest = array();
+		$client_names = array();
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			$forward_dest[resolveHostname($tmp[2],true)] = floatval($tmp[1]);
+			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+				$client_names[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
+			else
+				$client_names[$tmp[2]] = floatval($tmp[1]);
 		}
 
-		$result = array('clients' => $forward_dest);
+		$result = array('clients' => $client_names);
 		$data = array_merge($data, $result);
 	}
 

From a5635e7d3fe95fa6443ad6a52e000d924942dbba Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 11:28:46 +0200
Subject: [PATCH 072/172] Fix "FastCGI-stderr: PHP Notice:  Undefined offset:
 3" error

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index 7253e43c..87767ace 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -123,7 +123,7 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) === 4)
+			if(count($tmp) > 3)
 				$top_ads[$tmp[2]." (".$tmp[3].")"] = intval($tmp[1]);
 			else
 				$top_ads[$tmp[2]] = intval($tmp[1]);
@@ -161,7 +161,7 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+			if(count($tmp) > 3 && strlen($tmp[3]) > 0)
 				$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
 			else
 				$top_clients[$tmp[2]] = intval($tmp[1]);
@@ -186,7 +186,7 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+			if(count($tmp) > 3 && strlen($tmp[3]) > 0)
 				$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
 			else
 				$forward_dest[$tmp[2]] = floatval($tmp[1]);
@@ -282,7 +282,7 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) == 4)
+			if(count($tmp) > 3)
 			{
 				$forward_dest[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
 			}
@@ -321,7 +321,7 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) > 2 && strlen($tmp[3]) > 0)
+			if(count($tmp) > 3 && strlen($tmp[3]) > 0)
 				$client_names[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
 			else
 				$client_names[$tmp[2]] = floatval($tmp[1]);

From de1674e5ae52c23ccb743314925e43516b700921 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 11:39:42 +0200
Subject: [PATCH 073/172] Don't use resolveHostname in api.php?getAllQueries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api_FTL.php b/api_FTL.php
index 87767ace..14602e2a 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -242,7 +242,6 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			$tmp[3] = resolveHostname($tmp[3],false);
 			array_push($allQueries,$tmp);
 		}
 

From 7fde2f88d75c58ed1c502b36eebf49c0a357abb3 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Apr 2018 12:03:34 +0200
Subject: [PATCH 074/172] Re-add setting for displaying queries in the query
 log that has accidentially been removed when rearranging the settings page.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/settings.php b/settings.php
index bdfad4a3..c96e783b 100644
--- a/settings.php
+++ b/settings.php
@@ -920,6 +920,23 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                            <h4>Query Log</h4>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-lg-6">
+                                                <div class="form-group">
+                                                    <div class="checkbox"><label><input type="checkbox" name="querylog-permitted" <?php if($queryLog === "permittedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show permitted domain entries</label></div>
+                                                </div>
+                                            </div>
+                                            <div class="col-lg-6">
+                                                <div class="form-group">
+                                                    <div class="checkbox"><label><input type="checkbox" name="querylog-blocked" <?php if($queryLog === "blockedonly" || $queryLog === "all"){ ?>checked<?php } ?>> Show blocked domain entries</label></div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="box-footer clearfix">
                                         <input type="hidden" name="field" value="API">

From f2cefe6ce115ccd4601003bfe1bea0749cac4fc3 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 18 Apr 2018 17:11:36 +0200
Subject: [PATCH 075/172] Add frontend changes for supporting a local recursive
 DNS server

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 29 +++++++++++++++++++++++++---
 settings.php                         | 20 +++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index aa8d0a84..d659de62 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -198,11 +198,34 @@ function readAdlists()
 						}
 					}
 				}
+				$DNSservercount = count($DNSservers);
 
 				// Check if at least one DNS server has been added
-				if(count($DNSservers) < 1)
+				if(isset($_POST["localrecursive"]))
 				{
-					$error .= "No DNS server has been selected.<br>";
+					if(isset($_POST["localrecursiveport"]) &&
+					   is_numeric($_POST["localrecursiveport"]))
+					{
+						// Save port and modify dnsmasq.d config file
+						exec("sudo pihole -a localrecursivedns ".intval($_POST["localrecursiveport"]));
+						$DNSservercount++;
+					}
+					else if(isset($localrecursive))
+					{
+						// Remove entry without valid port
+						exec("sudo pihole -a localrecursivedns 0");
+					}
+				}
+				else
+				{
+					// Remove possible entry if unticked
+
+					exec("sudo pihole -a localrecursivedns 0");
+					// Check if at least one DNS server has been added
+					if($DNSservercount < 1)
+					{
+						$error .= "No DNS server has been selected.<br>";
+					}
 				}
 
 				// Check if domain-needed is requested
@@ -286,7 +309,7 @@ function readAdlists()
 					$IPs = implode (",", $DNSservers);
 					$return = exec("sudo pihole -a setdns ".$IPs." ".$extra);
 					$success .= htmlspecialchars($return)."<br>";
-					$success .= "The DNS settings have been updated (using ".count($DNSservers)." DNS servers)";
+					$success .= "The DNS settings have been updated (using ".$DNSservercount." DNS servers)";
 				}
 				else
 				{
diff --git a/settings.php b/settings.php
index c96e783b..a23bbf3c 100644
--- a/settings.php
+++ b/settings.php
@@ -205,6 +205,16 @@ if (isset($setupVars["QUERY_LOGGING"])) {
 } else {
     $piHoleLogging = true;
 }
+
+if (isset($setupVars["LOCAL_RECURSIVE"])) {
+    if($setupVars["LOCAL_RECURSIVE"]) {
+        $localrecursive = $setupVars["LOCAL_RECURSIVE"];
+    } else {
+        $localrecursive = false;
+    }
+} else {
+    $localrecursive = false;
+}
 ?>
 
 <?php
@@ -744,6 +754,16 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                data-inputmask="'alias': 'ipv6'" data-mask
                                                                <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
                                                     </div>
+                                                    <label>Local recursive server (see <a href="https://github.com/pi-hole/pi-hole/wiki/Pi-hole-as-recursive-DNS-server">here</a>)</label>
+                                                    <div class="input-group">
+                                                        <div class="input-group-addon">
+                                                            <input type="checkbox" name="localrecursive" value="yes"
+                                                                   <?php if ($localrecursive){ ?>checked<?php } ?>>
+                                                        </div>
+                                                        <input type="text" placeholder="127.0.0.1" class="form-control" disabled style="background: white; width: 25%;">
+                                                        <input type="text" name="localrecursiveport" class="form-control" placeholder="port" style="width: 75%"
+                                                               <?php if ($localrecursive){ ?>value="<?php echo $localrecursive; ?>"<?php } ?>>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>

From 7fa6cd85d3140798bbd48e6f69be7ef771ef3b6e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 18 Apr 2018 17:31:16 +0200
Subject: [PATCH 076/172] Be less specific, as this feature can be used for any
 time of local resolver running on a custom port

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 25 ++++++++++++-------------
 settings.php                         | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index d659de62..31de84f3 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -200,32 +200,31 @@ function readAdlists()
 				}
 				$DNSservercount = count($DNSservers);
 
-				// Check if at least one DNS server has been added
-				if(isset($_POST["localrecursive"]))
+				if(isset($_POST["localDNS"]))
 				{
-					if(isset($_POST["localrecursiveport"]) &&
-					   is_numeric($_POST["localrecursiveport"]))
+					if(isset($_POST["localDNSport"]) &&
+					   is_numeric($_POST["localDNSport"]))
 					{
 						// Save port and modify dnsmasq.d config file
-						exec("sudo pihole -a localrecursivedns ".intval($_POST["localrecursiveport"]));
+						exec("sudo pihole -a localdnsport ".intval($_POST["localDNSport"]));
 						$DNSservercount++;
 					}
-					else if(isset($localrecursive))
+					else if(isset($localdns))
 					{
 						// Remove entry without valid port
-						exec("sudo pihole -a localrecursivedns 0");
+						exec("sudo pihole -a localdnsport 0");
 					}
 				}
 				else
 				{
 					// Remove possible entry if unticked
 
-					exec("sudo pihole -a localrecursivedns 0");
-					// Check if at least one DNS server has been added
-					if($DNSservercount < 1)
-					{
-						$error .= "No DNS server has been selected.<br>";
-					}
+					exec("sudo pihole -a localdnsport 0");
+				}
+				// Check if at least one DNS server has been added
+				if($DNSservercount < 1)
+				{
+					$error .= "No DNS server has been selected.<br>";
 				}
 
 				// Check if domain-needed is requested
diff --git a/settings.php b/settings.php
index a23bbf3c..009fccb5 100644
--- a/settings.php
+++ b/settings.php
@@ -206,14 +206,14 @@ if (isset($setupVars["QUERY_LOGGING"])) {
     $piHoleLogging = true;
 }
 
-if (isset($setupVars["LOCAL_RECURSIVE"])) {
-    if($setupVars["LOCAL_RECURSIVE"]) {
-        $localrecursive = $setupVars["LOCAL_RECURSIVE"];
+if (isset($setupVars["LOCAL_DNS_PORT"])) {
+    if($setupVars["LOCAL_DNS_PORT"]) {
+        $localDNS = $setupVars["LOCAL_DNS_PORT"];
     } else {
-        $localrecursive = false;
+        $localDNS = false;
     }
 } else {
-    $localrecursive = false;
+    $localDNS = false;
 }
 ?>
 
@@ -754,15 +754,15 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                data-inputmask="'alias': 'ipv6'" data-mask
                                                                <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
                                                     </div>
-                                                    <label>Local recursive server (see <a href="https://github.com/pi-hole/pi-hole/wiki/Pi-hole-as-recursive-DNS-server">here</a>)</label>
+                                                    <label>Local DNS server on custom port</label>
                                                     <div class="input-group">
                                                         <div class="input-group-addon">
-                                                            <input type="checkbox" name="localrecursive" value="yes"
-                                                                   <?php if ($localrecursive){ ?>checked<?php } ?>>
+                                                            <input type="checkbox" name="localDNS" value="yes"
+                                                                   <?php if ($localDNS){ ?>checked<?php } ?>>
                                                         </div>
                                                         <input type="text" placeholder="127.0.0.1" class="form-control" disabled style="background: white; width: 25%;">
-                                                        <input type="text" name="localrecursiveport" class="form-control" placeholder="port" style="width: 75%"
-                                                               <?php if ($localrecursive){ ?>value="<?php echo $localrecursive; ?>"<?php } ?>>
+                                                        <input type="text" name="localDNSport" class="form-control" placeholder="port" style="width: 75%"
+                                                               <?php if ($localDNS){ ?>value="<?php echo $localDNS; ?>"<?php } ?>>
                                                     </div>
                                                 </div>
                                             </div>

From 6495a20aab797c48e45442bd8ed8cb2b6711ffb8 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 18 Apr 2018 17:41:19 +0200
Subject: [PATCH 077/172] Improve CSS

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.php b/settings.php
index 009fccb5..3e86fd1c 100644
--- a/settings.php
+++ b/settings.php
@@ -760,8 +760,8 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                             <input type="checkbox" name="localDNS" value="yes"
                                                                    <?php if ($localDNS){ ?>checked<?php } ?>>
                                                         </div>
-                                                        <input type="text" placeholder="127.0.0.1" class="form-control" disabled style="background: white; width: 25%;">
-                                                        <input type="text" name="localDNSport" class="form-control" placeholder="port" style="width: 75%"
+                                                        <input type="text" placeholder="127.0.0.1" class="form-control" disabled style="background: white; width: 50%; text-align: right;">
+                                                        <input type="text" name="localDNSport" class="form-control" placeholder="port" style="width: 50%"
                                                                <?php if ($localDNS){ ?>value="<?php echo $localDNS; ?>"<?php } ?>>
                                                     </div>
                                                 </div>

From 847d6aae5301c4ff85746c287738bc950885a559 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 18 Apr 2018 21:49:35 +0200
Subject: [PATCH 078/172] Improve code as suggested

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 18 +++++-------------
 settings.php                         | 12 ++++--------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 31de84f3..e373d7f8 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -200,20 +200,12 @@ function readAdlists()
 				}
 				$DNSservercount = count($DNSservers);
 
-				if(isset($_POST["localDNS"]))
+				if(isset($_POST["localDNS"]) && isset($_POST["localDNSport"]) &&
+				   is_numeric($_POST["localDNSport"]))
 				{
-					if(isset($_POST["localDNSport"]) &&
-					   is_numeric($_POST["localDNSport"]))
-					{
-						// Save port and modify dnsmasq.d config file
-						exec("sudo pihole -a localdnsport ".intval($_POST["localDNSport"]));
-						$DNSservercount++;
-					}
-					else if(isset($localdns))
-					{
-						// Remove entry without valid port
-						exec("sudo pihole -a localdnsport 0");
-					}
+					// Save port and modify dnsmasq.d config file
+					exec("sudo pihole -a localdnsport ".intval($_POST["localDNSport"]));
+					$DNSservercount++;
 				}
 				else
 				{
diff --git a/settings.php b/settings.php
index 3e86fd1c..87bd9db8 100644
--- a/settings.php
+++ b/settings.php
@@ -206,14 +206,10 @@ if (isset($setupVars["QUERY_LOGGING"])) {
     $piHoleLogging = true;
 }
 
-if (isset($setupVars["LOCAL_DNS_PORT"])) {
-    if($setupVars["LOCAL_DNS_PORT"]) {
-        $localDNS = $setupVars["LOCAL_DNS_PORT"];
-    } else {
-        $localDNS = false;
-    }
-} else {
-    $localDNS = false;
+$localDNS = false;
+if(isset($setupVars["LOCAL_DNS_PORT"]) && is_numeric($setupVars["LOCAL_DNS_PORT"]))
+{
+    $localDNS = intval($setupVars["LOCAL_DNS_PORT"]);
 }
 ?>
 

From 4c91d65547412c96b3a54d26264ebcfcf547851e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 19 Apr 2018 07:38:34 +0200
Subject: [PATCH 079/172] Make sure backend does always interpret list of DNS
 servers even if it is empty

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index e373d7f8..dbf49778 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -298,7 +298,7 @@ function readAdlists()
 				if(!strlen($error))
 				{
 					$IPs = implode (",", $DNSservers);
-					$return = exec("sudo pihole -a setdns ".$IPs." ".$extra);
+					$return = exec("sudo pihole -a setdns \"".$IPs."\" ".$extra);
 					$success .= htmlspecialchars($return)."<br>";
 					$success .= "The DNS settings have been updated (using ".$DNSservercount." DNS servers)";
 				}

From ec0a8f32a7acaf7b0859ef745cf43bd4db682447 Mon Sep 17 00:00:00 2001
From: Walter <github@exclusive-it.nl>
Date: Mon, 23 Apr 2018 16:31:55 +0200
Subject: [PATCH 080/172] Display number of lists used in title of settings >
 blocklist

Helps to visibly notice changes, instead of having to manually count them.
---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 87bd9db8..09d28f84 100644
--- a/settings.php
+++ b/settings.php
@@ -271,7 +271,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                             <div class="col-md-12">
                                 <div class="box">
                                     <div class="box-header with-border">
-                                        <h3 class="box-title">Lists used to generate Pi-hole's Gravity</h3>
+                                        <h3 class="box-title">Lists used to generate Pi-hole's Gravity: <?php echo count($adlist); ?></h3>
                                     </div>
                                     <div class="box-body">
                                         <div class="table-responsive">

From 2c2a091b03052d3eedf909354c7835391f73d24a Mon Sep 17 00:00:00 2001
From: Walter <github@exclusive-it.nl>
Date: Mon, 23 Apr 2018 20:32:38 +0200
Subject: [PATCH 081/172] Changes concerning the date the gravity list was last
 changed. Used in the webinterface dashboard as a tooltip, and now also
 available in the API (both PHP and FTL). Function was moved to new file
 /scripts/pi-hole/php/gravity.php to keep things neat and to avoid duplicate
 code.

---
 api_FTL.php                     |  2 ++
 api_PHP.php                     |  2 ++
 index.php                       | 24 +++-------------
 scripts/pi-hole/php/gravity.php | 51 +++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 scripts/pi-hole/php/gravity.php

diff --git a/api_FTL.php b/api_FTL.php
index 14602e2a..e67405dc 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -31,6 +31,7 @@ else
 
 	if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET))
 	{
+		require_once("scripts/pi-hole/php/gravity.php");
 		sendRequestFTL("stats");
 		$return = getResponseFTL();
 
@@ -61,6 +62,7 @@ else
 				$stats[$tmp[0]] = floatval($tmp[1]);
 			}
 		}
+		$stats['gravity_last_updated'] = gravity_last_update(true);
 		$data = array_merge($data,$stats);
 	}
 
diff --git a/api_PHP.php b/api_PHP.php
index dc7a1d2b..52bbd613 100644
--- a/api_PHP.php
+++ b/api_PHP.php
@@ -13,6 +13,7 @@
     }
 
     include('scripts/pi-hole/php/data.php');
+    include_once('scripts/pi-hole/php/gravity.php');
 
     // Non-Auth
 
@@ -34,6 +35,7 @@
         $sum['dns_queries_today'] = number_format( $sum['dns_queries_today']);
         $sum['ads_percentage_today'] = number_format( $sum['ads_percentage_today'], 1, '.', '');
         $sum['domains_being_blocked'] = number_format( $sum['domains_being_blocked']);
+        $sum['gravity_last_updated'] = gravity_last_update(true);
         $data = array_merge($data,  $sum);
     }
 
diff --git a/index.php b/index.php
index da1bec33..18984ff2 100644
--- a/index.php
+++ b/index.php
@@ -7,6 +7,7 @@
 *    Please see LICENSE file for your rights under this license. */
     $indexpage = true;
     require "scripts/pi-hole/php/header.php";
+    require_once("scripts/pi-hole/php/gravity.php"); 
 ?>
 <!-- Small boxes (Stat box) -->
 <div class="row">
@@ -48,27 +49,10 @@
             </div>
         </div>
     </div>
-<?php
-$gravitylist = "/etc/pihole/gravity.list";
-if (file_exists($gravitylist))
-{
-    $gravitydiff = date_diff(date_create("@".filemtime($gravitylist)),date_create("now"));
-    if($gravitydiff->d > 1)
-        $gravitydate = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
-    elseif($gravitydiff->d == 1)
-        $gravitydate = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
-    else
-        $gravitydate = $gravitydiff->format("Blocking list updated %H:%I ago");
-}
-else
-{
-    $gravitydate = "Blocking list not found";
-}
-?>
     <!-- ./col -->
     <div class="col-lg-3 col-xs-12">
         <!-- small box -->
-        <div class="small-box bg-red" title="<?php echo $gravitydate; ?>">
+        <div class="small-box bg-red" title="<?php echo gravity_last_update(); ?>">
             <div class="inner">
                 <p>Domains on Blocklist</p>
                 <h3 class="statistic"><span id="domains_being_blocked">---</span></h3>
@@ -229,11 +213,11 @@ else
 <?php
 if($boxedlayout)
 {
-	$tablelayout = "col-md-6";
+  $tablelayout = "col-md-6";
 }
 else
 {
-	$tablelayout = "col-md-6 col-lg-4";
+  $tablelayout = "col-md-6 col-lg-4";
 }
 ?>
 <div class="row">
diff --git a/scripts/pi-hole/php/gravity.php b/scripts/pi-hole/php/gravity.php
new file mode 100644
index 00000000..4ce5e5bf
--- /dev/null
+++ b/scripts/pi-hole/php/gravity.php
@@ -0,0 +1,51 @@
+<?php
+/* Pi-hole: A black hole for Internet advertisements
+*  (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+*  Network-wide ad blocking via your own hardware.
+*
+*  This file is copyright under the latest version of the EUPL.
+*  Please see LICENSE file for your rights under this license. */
+
+function gravity_last_update($raw = false){
+	/*
+	@walter-exit | April 23rd, 2018:
+	Checks when the gravity list was last updated, if it exists at all.
+	Returns the info in human-readable format for use on the dashboard,
+	or raw for use by the API.
+	*/
+	$gravitylist = "/etc/pihole/gravity.list";
+	if (file_exists($gravitylist)){
+		$date_file_created_unix = filemtime($gravitylist);
+		$date_file_created = date_create("@".$date_file_created_unix);
+		$date_now = date_create("now");
+	    $gravitydiff = date_diff($date_file_created,$date_now);
+	    if($raw){
+			$output = array(
+				"file_exists"=> true,
+				"absolute" => $date_file_created_unix,
+				"relative" => array(
+					"days" =>  $gravitydiff->format("%a"),
+					"hours" =>  $gravitydiff->format("%H"),
+					"minutes" =>  $gravitydiff->format("%I"),
+				)
+			);
+		}else{
+			if($gravitydiff->d > 1){
+		        $output = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
+		    }elseif($gravitydiff->d == 1){
+		        $output = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
+		    }else{
+		        $output = $gravitydiff->format("Blocking list updated %H:%I ago");
+		    }
+		}
+	}else{
+		if($raw){
+			$output = array("file_exists"=>false);
+		}else{
+			$output = "Blocking list not found";	
+		}
+	}
+	return $output;
+}
+
+?>
\ No newline at end of file

From 45fbdae34b827c8c054862322bf35cfd39b5138f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Str=C3=B6ger?= <florian.stroeger@gmail.com>
Date: Thu, 26 Apr 2018 20:04:54 +0200
Subject: [PATCH 082/172] Add API Token in Text

---
 scripts/pi-hole/php/api_token.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/pi-hole/php/api_token.php b/scripts/pi-hole/php/api_token.php
index be83895f..a5d8ea64 100644
--- a/scripts/pi-hole/php/api_token.php
+++ b/scripts/pi-hole/php/api_token.php
@@ -11,6 +11,8 @@ if($auth)
     require_once("../../vendor/qrcode.php");
     $qr = QRCode::getMinimumQRCode($pwhash, QR_ERROR_CORRECT_LEVEL_Q);
     $qr->printHTML("10px");
+    print($pwhash); 
+
   }
   else
   {

From 5f3f1053879eac1541ba68d7e43c007682729f8b Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 28 Apr 2018 23:09:54 +0200
Subject: [PATCH 083/172] Add frontend changes necessary for
 https://github.com/pi-hole/FTL/pull/264

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

diff --git a/index.php b/index.php
index da1bec33..3cac6925 100644
--- a/index.php
+++ b/index.php
@@ -148,7 +148,7 @@ else
     <div class="col-md-12 col-lg-6">
     <div class="box" id="forward-destinations-pie">
         <div class="box-header with-border">
-          <h3 class="box-title">Forward Destinations (integrated)</h3>
+          <h3 class="box-title">Queries answered by (integrated)</h3>
         </div>
         <div class="box-body">
           <div class="float-left" style="width:50%">
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 2eabe0e6..390c19b7 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -450,7 +450,7 @@ function updateClientsOverTime() {
 }
 
 function updateForwardDestinationsPie() {
-    $.getJSON("api.php?getForwardDestinations=unsorted", function(data) {
+    $.getJSON("api.php?getForwardDestinations", function(data) {
 
         if("FTLnotrunning" in data)
         {
@@ -471,9 +471,6 @@ function updateForwardDestinationsPie() {
             values.push([key, value, colors.shift()]);
         });
 
-        // Sort data ASC accorwing to 2nd column, keep already assigned labels and colors
-        values = values.sort(function(a,b) { return b[1] - a[1]; });
-
         // Split data into individual arrays for the graphs
         $.each(values, function(key , value) {
             k.push(value[0]);

From 2c7b6c07c6cb063d27f38dae360bd868f59a2462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Str=C3=B6ger?= <florian.stroeger@gmail.com>
Date: Sun, 29 Apr 2018 10:17:10 +0200
Subject: [PATCH 084/172] Added "Raw API Token:"

As requested
---
 scripts/pi-hole/php/api_token.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pi-hole/php/api_token.php b/scripts/pi-hole/php/api_token.php
index a5d8ea64..ae6ce9d5 100644
--- a/scripts/pi-hole/php/api_token.php
+++ b/scripts/pi-hole/php/api_token.php
@@ -11,6 +11,7 @@ if($auth)
     require_once("../../vendor/qrcode.php");
     $qr = QRCode::getMinimumQRCode($pwhash, QR_ERROR_CORRECT_LEVEL_Q);
     $qr->printHTML("10px");
+    print("Raw API Token: ");
     print($pwhash); 
 
   }

From f9d456720faf2398568b5c656ccd75f4ee1e8b8d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 29 Apr 2018 17:30:42 +0200
Subject: [PATCH 085/172] Relax warnings. They are not needed any more.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 257ab7d4..7fa1227b 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -68,7 +68,7 @@ $(".confirm-restartdns").confirm({
 });
 
 $(".confirm-flushlogs").confirm({
-	text: "By default, the log is flushed at the end of the day via cron, but a very large log file can slow down the Web interface, so flushing it can be useful. Note that your statistics will be reset and you lose the statistics up to this point. Are you sure you want to flush your logs?",
+	text: "Are you sure you want to flush your logs?",
 	title: "Confirmation required",
 	confirm(button) {
 		$("#flushlogsform").submit();
@@ -85,7 +85,7 @@ $(".confirm-flushlogs").confirm({
 });
 
 $(".confirm-disablelogging").confirm({
-	text: "Note that disabling query logging will render graphs on the web user interface useless. Are you sure you want to disable logging and flush your Pi-hole logs?",
+	text: "Are you sure you want to disable logging and flush your Pi-hole logs?",
 	title: "Confirmation required",
 	confirm(button) {
 		$("#disablelogsform").submit();
@@ -102,7 +102,7 @@ $(".confirm-disablelogging").confirm({
 });
 
 $(".confirm-disablelogging-noflush").confirm({
-	text: "Note that disabling query logging will render graphs on the web user interface useless after this point. Are you sure you want to disable logging?",
+	text: "Are you sure you want to disable logging?",
 	title: "Confirmation required",
 	confirm(button) {
 		$("#disablelogsform-noflush").submit();

From 6f3eeb6406bb1baef82feb618d04d06d68fd594b Mon Sep 17 00:00:00 2001
From: Mark Drobnak <newtoncat12@yahoo.com>
Date: Sun, 29 Apr 2018 11:32:52 -0400
Subject: [PATCH 086/172] Remove (integrated) from doughnut charts

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 3cac6925..55c7e4f7 100644
--- a/index.php
+++ b/index.php
@@ -129,7 +129,7 @@ else
     <div class="col-md-12 col-lg-6">
     <div class="box" id="query-types-pie">
         <div class="box-header with-border">
-          <h3 class="box-title">Query Types (integrated)</h3>
+          <h3 class="box-title">Query Types</h3>
         </div>
         <div class="box-body">
           <div class="float-left" style="width:50%">
@@ -148,7 +148,7 @@ else
     <div class="col-md-12 col-lg-6">
     <div class="box" id="forward-destinations-pie">
         <div class="box-header with-border">
-          <h3 class="box-title">Queries answered by (integrated)</h3>
+          <h3 class="box-title">Queries answered by</h3>
         </div>
         <div class="box-body">
           <div class="float-left" style="width:50%">

From 983966da04f9607ffc70d89dcf51b0597c803e3f Mon Sep 17 00:00:00 2001
From: Walter <github@exclusive-it.nl>
Date: Wed, 2 May 2018 11:01:38 +0200
Subject: [PATCH 087/172] Changed indentation from spaces and tabs to only tabs

---
 scripts/pi-hole/php/gravity.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/pi-hole/php/gravity.php b/scripts/pi-hole/php/gravity.php
index 4ce5e5bf..7b55a8a8 100644
--- a/scripts/pi-hole/php/gravity.php
+++ b/scripts/pi-hole/php/gravity.php
@@ -18,8 +18,8 @@ function gravity_last_update($raw = false){
 		$date_file_created_unix = filemtime($gravitylist);
 		$date_file_created = date_create("@".$date_file_created_unix);
 		$date_now = date_create("now");
-	    $gravitydiff = date_diff($date_file_created,$date_now);
-	    if($raw){
+		$gravitydiff = date_diff($date_file_created,$date_now);
+		if($raw){
 			$output = array(
 				"file_exists"=> true,
 				"absolute" => $date_file_created_unix,
@@ -31,12 +31,12 @@ function gravity_last_update($raw = false){
 			);
 		}else{
 			if($gravitydiff->d > 1){
-		        $output = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
-		    }elseif($gravitydiff->d == 1){
-		        $output = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
-		    }else{
-		        $output = $gravitydiff->format("Blocking list updated %H:%I ago");
-		    }
+				$output = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
+			}elseif($gravitydiff->d == 1){
+				$output = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
+			}else{
+				$output = $gravitydiff->format("Blocking list updated %H:%I ago");
+			}
 		}
 	}else{
 		if($raw){

From 49190f8a620021d5472956bdb5176ce8d3d88899 Mon Sep 17 00:00:00 2001
From: Walter <github@exclusive-it.nl>
Date: Wed, 2 May 2018 11:07:28 +0200
Subject: [PATCH 088/172] Changed indentation from all tabs to all spaces
 (misread preference, my bad)

---
 scripts/pi-hole/php/gravity.php | 78 ++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/scripts/pi-hole/php/gravity.php b/scripts/pi-hole/php/gravity.php
index 7b55a8a8..407b8ab6 100644
--- a/scripts/pi-hole/php/gravity.php
+++ b/scripts/pi-hole/php/gravity.php
@@ -7,45 +7,45 @@
 *  Please see LICENSE file for your rights under this license. */
 
 function gravity_last_update($raw = false){
-	/*
-	@walter-exit | April 23rd, 2018:
-	Checks when the gravity list was last updated, if it exists at all.
-	Returns the info in human-readable format for use on the dashboard,
-	or raw for use by the API.
-	*/
-	$gravitylist = "/etc/pihole/gravity.list";
-	if (file_exists($gravitylist)){
-		$date_file_created_unix = filemtime($gravitylist);
-		$date_file_created = date_create("@".$date_file_created_unix);
-		$date_now = date_create("now");
-		$gravitydiff = date_diff($date_file_created,$date_now);
-		if($raw){
-			$output = array(
-				"file_exists"=> true,
-				"absolute" => $date_file_created_unix,
-				"relative" => array(
-					"days" =>  $gravitydiff->format("%a"),
-					"hours" =>  $gravitydiff->format("%H"),
-					"minutes" =>  $gravitydiff->format("%I"),
-				)
-			);
-		}else{
-			if($gravitydiff->d > 1){
-				$output = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
-			}elseif($gravitydiff->d == 1){
-				$output = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
-			}else{
-				$output = $gravitydiff->format("Blocking list updated %H:%I ago");
-			}
-		}
-	}else{
-		if($raw){
-			$output = array("file_exists"=>false);
-		}else{
-			$output = "Blocking list not found";	
-		}
-	}
-	return $output;
+    /*
+    @walter-exit | April 23rd, 2018:
+    Checks when the gravity list was last updated, if it exists at all.
+    Returns the info in human-readable format for use on the dashboard,
+    or raw for use by the API.
+    */
+    $gravitylist = "/etc/pihole/gravity.list";
+    if (file_exists($gravitylist)){
+        $date_file_created_unix = filemtime($gravitylist);
+        $date_file_created = date_create("@".$date_file_created_unix);
+        $date_now = date_create("now");
+        $gravitydiff = date_diff($date_file_created,$date_now);
+        if($raw){
+            $output = array(
+                "file_exists"=> true,
+                "absolute" => $date_file_created_unix,
+                "relative" => array(
+                    "days" =>  $gravitydiff->format("%a"),
+                    "hours" =>  $gravitydiff->format("%H"),
+                    "minutes" =>  $gravitydiff->format("%I"),
+                )
+            );
+        }else{
+            if($gravitydiff->d > 1){
+                $output = $gravitydiff->format("Blocking list updated %a days, %H:%I ago");
+            }elseif($gravitydiff->d == 1){
+                $output = $gravitydiff->format("Blocking list updated one day, %H:%I ago");
+            }else{
+                $output = $gravitydiff->format("Blocking list updated %H:%I ago");
+            }
+        }
+    }else{
+        if($raw){
+            $output = array("file_exists"=>false);
+        }else{
+            $output = "Blocking list not found";	
+        }
+    }
+    return $output;
 }
 
 ?>
\ No newline at end of file

From 967216ca7492f37f0ee009b1733b5383f08480b0 Mon Sep 17 00:00:00 2001
From: Walter <github@exclusive-it.nl>
Date: Wed, 2 May 2018 20:12:15 +0200
Subject: [PATCH 089/172] Signed-off-by: Walter <walter@exclusive-it.nl>

---
 scripts/pi-hole/php/gravity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/gravity.php b/scripts/pi-hole/php/gravity.php
index 407b8ab6..cb3c3404 100644
--- a/scripts/pi-hole/php/gravity.php
+++ b/scripts/pi-hole/php/gravity.php
@@ -8,7 +8,7 @@
 
 function gravity_last_update($raw = false){
     /*
-    @walter-exit | April 23rd, 2018:
+    @walter-exit <walter@exclusive-it.nl> | April 23rd, 2018:
     Checks when the gravity list was last updated, if it exists at all.
     Returns the info in human-readable format for use on the dashboard,
     or raw for use by the API.

From 6d8c3de5bab52f283f444f9d8ae2b045bdefcea2 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 4 May 2018 19:14:31 +0200
Subject: [PATCH 090/172] Support custom ports in the custom DNS server tab on
 the settings page

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 19 ++++++++++++++++---
 settings.php                         |  8 ++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index dbf49778..114ac41f 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -187,15 +187,28 @@ function readAdlists()
 				{
 					if(array_key_exists("custom".$i,$_POST))
 					{
-						$IP = $_POST["custom".$i."val"];
-						if(validIP($IP))
+						$exploded = explode("#", $_POST["custom".$i."val"], 2);
+						$IP = $exploded[0];
+						if(count($exploded) > 1)
 						{
-							array_push($DNSservers,$IP);
+							$port = $exploded[1];
 						}
 						else
+						{
+							$port = "53";
+						}
+						if(!validIP($IP))
 						{
 							$error .= "IP (".htmlspecialchars($IP).") is invalid!<br>";
 						}
+						elseif(!is_numeric($port))
+						{
+							$error .= "Port (".htmlspecialchars($port).") is invalid!<br>";
+						}
+						else
+						{
+							array_push($DNSservers,$IP."#".$port);
+						}
 					}
 				}
 				$DNSservercount = count($DNSservers);
diff --git a/settings.php b/settings.php
index 09d28f84..217cd4b2 100644
--- a/settings.php
+++ b/settings.php
@@ -128,13 +128,13 @@ $i = 1;
 while (isset($setupVars["PIHOLE_DNS_" . $i])) {
     if (isinserverlist($setupVars["PIHOLE_DNS_" . $i])) {
         array_push($DNSactive, $setupVars["PIHOLE_DNS_" . $i]);
-    } elseif (strpos($setupVars["PIHOLE_DNS_" . $i], ".")) {
+    } elseif (strpos($setupVars["PIHOLE_DNS_" . $i], ".") !== false) {
         if (!isset($custom1)) {
             $custom1 = $setupVars["PIHOLE_DNS_" . $i];
         } else {
             $custom2 = $setupVars["PIHOLE_DNS_" . $i];
         }
-    } elseif (strpos($setupVars["PIHOLE_DNS_" . $i], ":")) {
+    } elseif (strpos($setupVars["PIHOLE_DNS_" . $i], ":") !== false) {
         if (!isset($custom3)) {
             $custom3 = $setupVars["PIHOLE_DNS_" . $i];
         } else {
@@ -717,7 +717,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                    <?php if (isset($custom1)){ ?>checked<?php } ?>>
                                                         </div>
                                                         <input type="text" name="custom1val" class="form-control"
-                                                               data-inputmask="'alias': 'ip'" data-mask
                                                                <?php if (isset($custom1)){ ?>value="<?php echo $custom1; ?>"<?php } ?>>
                                                     </div>
                                                     <label>Custom 2 (IPv4)</label>
@@ -727,7 +726,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                    <?php if (isset($custom2)){ ?>checked<?php } ?>>
                                                         </div>
                                                         <input type="text" name="custom2val" class="form-control"
-                                                               data-inputmask="'alias': 'ip'" data-mask
                                                                <?php if (isset($custom2)){ ?>value="<?php echo $custom2; ?>"<?php } ?>>
                                                     </div>
                                                     <label>Custom 3 (IPv6)</label>
@@ -737,7 +735,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                    <?php if (isset($custom3)){ ?>checked<?php } ?>>
                                                         </div>
                                                         <input type="text" name="custom3val" class="form-control"
-                                                               data-inputmask="'alias': 'ipv6'" data-mask
                                                                <?php if (isset($custom3)){ ?>value="<?php echo $custom3; ?>"<?php } ?>>
                                                     </div>
                                                     <label>Custom 4 (IPv6)</label>
@@ -747,7 +744,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                    <?php if (isset($custom4)){ ?>checked<?php } ?>>
                                                         </div>
                                                         <input type="text" name="custom4val" class="form-control"
-                                                               data-inputmask="'alias': 'ipv6'" data-mask
                                                                <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
                                                     </div>
                                                     <label>Local DNS server on custom port</label>

From dd96847cc59660e7420e14decbb7f029fa6e865f Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 4 May 2018 19:16:55 +0200
Subject: [PATCH 091/172] Remove local DNS with custom port field as it is
 superseeded by the more powerful custom 1/2/3/4 implementation

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 14 ++------------
 settings.php                         | 16 ----------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 114ac41f..86a50161 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -213,19 +213,9 @@ function readAdlists()
 				}
 				$DNSservercount = count($DNSservers);
 
-				if(isset($_POST["localDNS"]) && isset($_POST["localDNSport"]) &&
-				   is_numeric($_POST["localDNSport"]))
-				{
-					// Save port and modify dnsmasq.d config file
-					exec("sudo pihole -a localdnsport ".intval($_POST["localDNSport"]));
-					$DNSservercount++;
-				}
-				else
-				{
-					// Remove possible entry if unticked
+				// Remove possibly existing localdnsport setting
+				exec("sudo pihole -a localdnsport 0");
 
-					exec("sudo pihole -a localdnsport 0");
-				}
 				// Check if at least one DNS server has been added
 				if($DNSservercount < 1)
 				{
diff --git a/settings.php b/settings.php
index 217cd4b2..85aa9dfa 100644
--- a/settings.php
+++ b/settings.php
@@ -205,12 +205,6 @@ if (isset($setupVars["QUERY_LOGGING"])) {
 } else {
     $piHoleLogging = true;
 }
-
-$localDNS = false;
-if(isset($setupVars["LOCAL_DNS_PORT"]) && is_numeric($setupVars["LOCAL_DNS_PORT"]))
-{
-    $localDNS = intval($setupVars["LOCAL_DNS_PORT"]);
-}
 ?>
 
 <?php
@@ -746,16 +740,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                         <input type="text" name="custom4val" class="form-control"
                                                                <?php if (isset($custom4)){ ?>value="<?php echo $custom4; ?>"<?php } ?>>
                                                     </div>
-                                                    <label>Local DNS server on custom port</label>
-                                                    <div class="input-group">
-                                                        <div class="input-group-addon">
-                                                            <input type="checkbox" name="localDNS" value="yes"
-                                                                   <?php if ($localDNS){ ?>checked<?php } ?>>
-                                                        </div>
-                                                        <input type="text" placeholder="127.0.0.1" class="form-control" disabled style="background: white; width: 50%; text-align: right;">
-                                                        <input type="text" name="localDNSport" class="form-control" placeholder="port" style="width: 50%"
-                                                               <?php if ($localDNS){ ?>value="<?php echo $localDNS; ?>"<?php } ?>>
-                                                    </div>
                                                 </div>
                                             </div>
                                         </div>

From bd25557469534546164bceb9c5e968bf600a16e0 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 4 May 2018 22:11:50 +0200
Subject: [PATCH 092/172] Remove last traces of local custom port settings

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/savesettings.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 86a50161..3599b92c 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -213,9 +213,6 @@ function readAdlists()
 				}
 				$DNSservercount = count($DNSservers);
 
-				// Remove possibly existing localdnsport setting
-				exec("sudo pihole -a localdnsport 0");
-
 				// Check if at least one DNS server has been added
 				if($DNSservercount < 1)
 				{

From 85dd92771a61679a67e38f0044308230ecd22716 Mon Sep 17 00:00:00 2001
From: rrobgill <35944068+rrobgill@users.noreply.github.com>
Date: Sat, 5 May 2018 14:42:04 +1000
Subject: [PATCH 093/172] Cookie login

Allow user to (optionally) set a cookie for automatic login.
Expiry is set for 7 days.
Cookie refreshes, extending for 7 days from each use.
---
 scripts/pi-hole/php/password.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index ad8cbd08..f088ed8c 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -24,9 +24,13 @@
     }
 
     // If the user wants to log out, we free all session variables currently registered
+    // and delete any persistent cookie.
     if(isset($_GET["logout"]))
     {
         session_unset();
+        setcookie('sesshash', '');
+	    header('Location: index.php');
+        exit();
     }
 
     $wrongpassword = false;
@@ -35,8 +39,16 @@
     // Test if password is set
     if(strlen($pwhash) > 0)
     {
+        // Check for and authorize from persistent cookie 
+        if (isset($_COOKIE["sesshash"]))
+        {
+            if ($pwhash = $_COOKIE["sesshash"])
+                $auth = true;
+		// Refresh cookie with new expiry
+                setcookie('sesshash', $pwhash, time()+60*60*24*7);
+        }
         // Compare doubly hashes password input with saved hash
-        if(isset($_POST["pw"]))
+        else if(isset($_POST["pw"]))
         {
             $postinput = hash('sha256',hash('sha256',$_POST["pw"]));
             if(hash_equals($pwhash, $postinput))
@@ -45,6 +57,11 @@
 
                 // Login successful, redirect the user to the homepage to discard the POST request
                 if ($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['QUERY_STRING'] === 'login') {
+                    // Set persistent cookie if selected
+                    if (isset($_POST['cook']))
+                    {
+                        setcookie('sesshash', $pwhash, time()+60*60*24*7);
+                    }
                     header('Location: index.php');
                     exit();
                 }

From fb988f247d2670f00382a0f22d5fb4a617117c47 Mon Sep 17 00:00:00 2001
From: rrobgill <35944068+rrobgill@users.noreply.github.com>
Date: Sat, 5 May 2018 14:45:04 +1000
Subject: [PATCH 094/172] Cookie login

Allow user to (optionally) set a cookie for automatic login.

UI addition of checkbox and informs user of option to store a cookie.
---
 scripts/pi-hole/php/loginpage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index cf080756..e26518bb 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -25,6 +25,7 @@
       <form action="" id="loginform" method="post">
         <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
           <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" autofocus>
+          <input type="checkbox" id="logincookie" name="cook" class="form=control"> Remember me for 7 days (sets cookie)
           <span class="fa fa-key form-control-feedback"></span>
         </div>
         <div class="row">

From d64292ba5c6d5d591becaaa4a1fe00e05a372eeb Mon Sep 17 00:00:00 2001
From: rrobgill <35944068+rrobgill@users.noreply.github.com>
Date: Tue, 8 May 2018 17:24:09 +1000
Subject: [PATCH 095/172] Update loginpage.php

---
 scripts/pi-hole/php/loginpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index e26518bb..967f050d 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -25,7 +25,7 @@
       <form action="" id="loginform" method="post">
         <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
           <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" autofocus>
-          <input type="checkbox" id="logincookie" name="cook" class="form=control"> Remember me for 7 days (sets cookie)
+          <input type="checkbox" id="logincookie" name="cook" class="form=control"> Remember me for 7 days
           <span class="fa fa-key form-control-feedback"></span>
         </div>
         <div class="row">

From 84b6f6b2918825cce6c2ebc3c43cf29477ee8c90 Mon Sep 17 00:00:00 2001
From: rrobgill <35944068+rrobgill@users.noreply.github.com>
Date: Tue, 8 May 2018 17:24:11 +1000
Subject: [PATCH 096/172] Update password.php

---
 scripts/pi-hole/php/password.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index f088ed8c..76236f53 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -28,7 +28,7 @@
     if(isset($_GET["logout"]))
     {
         session_unset();
-        setcookie('sesshash', '');
+        setcookie('persistentlogin', '');
 	    header('Location: index.php');
         exit();
     }
@@ -40,12 +40,12 @@
     if(strlen($pwhash) > 0)
     {
         // Check for and authorize from persistent cookie 
-        if (isset($_COOKIE["sesshash"]))
+        if (isset($_COOKIE["persistentlogin"]))
         {
-            if ($pwhash = $_COOKIE["sesshash"])
+            if ($pwhash = $_COOKIE["persistentlogin"])
                 $auth = true;
 		// Refresh cookie with new expiry
-                setcookie('sesshash', $pwhash, time()+60*60*24*7);
+                setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
         }
         // Compare doubly hashes password input with saved hash
         else if(isset($_POST["pw"]))
@@ -60,7 +60,7 @@
                     // Set persistent cookie if selected
                     if (isset($_POST['cook']))
                     {
-                        setcookie('sesshash', $pwhash, time()+60*60*24*7);
+                        setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
                     }
                     header('Location: index.php');
                     exit();

From a8bf42687c648f6eef95f97163cb52011509d1d6 Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 8 May 2018 19:05:19 +1000
Subject: [PATCH 097/172] Update password.php

---
 scripts/pi-hole/php/password.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index 76236f53..9718df56 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -58,7 +58,7 @@
                 // Login successful, redirect the user to the homepage to discard the POST request
                 if ($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['QUERY_STRING'] === 'login') {
                     // Set persistent cookie if selected
-                    if (isset($_POST['cook']))
+                    if (isset($_POST['persistentlogin']))
                     {
                         setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
                     }

From 8eed0e09d9e17b804a49cf9e640db2cbf008c7fb Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 8 May 2018 19:05:42 +1000
Subject: [PATCH 098/172] Update loginpage.php

---
 scripts/pi-hole/php/loginpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 967f050d..3f0a7922 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -25,7 +25,7 @@
       <form action="" id="loginform" method="post">
         <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
           <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" autofocus>
-          <input type="checkbox" id="logincookie" name="cook" class="form=control"> Remember me for 7 days
+          <input type="checkbox" id="logincookie" name="persistentlogin" class="form=control"> Remember me for 7 days
           <span class="fa fa-key form-control-feedback"></span>
         </div>
         <div class="row">

From adeec42dd482ef08a7da6871aafdc7dfb1f036ee Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Wed, 9 May 2018 08:31:34 +1000
Subject: [PATCH 099/172] relocate checkbox

Persistent login checkbox moved from form feedback.
---
 scripts/pi-hole/php/loginpage.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 3f0a7922..89bde7ab 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -25,7 +25,6 @@
       <form action="" id="loginform" method="post">
         <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
           <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" autofocus>
-          <input type="checkbox" id="logincookie" name="persistentlogin" class="form=control"> Remember me for 7 days
           <span class="fa fa-key form-control-feedback"></span>
         </div>
         <div class="row">
@@ -36,6 +35,9 @@
           </ul>
           </div>
           <div class="col-xs-4">
+            <div class="form-group">
+            <div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div>
+            </div>
             <button type="submit" href="#" class="btn btn-primary pull-right"><i class="glyphicon glyphicon-log-in"></i>&nbsp;&nbsp;&nbsp;Log in</button>
           </div>
         </div>

From fd3a7d3f57a5c8ca04d43366c5673e64db31f322 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 9 May 2018 18:39:29 +0200
Subject: [PATCH 100/172] Don't return too early when filling tables with top
 domains/top ads data. Otherwise, we might miss to remove the loading
 spinners. This fixes an issue brought up on Discourse.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 390c19b7..34a8de06 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -617,7 +617,6 @@ function updateTopLists() {
         if(jQuery.isEmptyObject(data.top_queries))
         {
             $("#domain-frequency").parent().remove();
-            return;
         }
 
         for (domain in data.top_ads) {
@@ -641,7 +640,6 @@ function updateTopLists() {
         if(jQuery.isEmptyObject(data.top_ads))
         {
             $("#ad-frequency").parent().remove();
-            return;
         }
 
         $("#domain-frequency .overlay").hide();

From 5733d087455a2d2d7c87f88a3cfbf2ac452ecfae Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Thu, 10 May 2018 08:54:44 +1000
Subject: [PATCH 101/172] Remove invalid cookie

If cookie is invalid, it is cleared from the browser before continuing
---
 scripts/pi-hole/php/password.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index 9718df56..3dc58e2a 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -43,9 +43,14 @@
         if (isset($_COOKIE["persistentlogin"]))
         {
             if ($pwhash = $_COOKIE["persistentlogin"])
-                $auth = true;
+	    {	$auth = true;
 		// Refresh cookie with new expiry
                 setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
+	    else 
+		// Invalid cookie 
+		$auth = false;
+		setcookie('persistentlogin', '');
+	    }
         }
         // Compare doubly hashes password input with saved hash
         else if(isset($_POST["pw"]))

From 7a3fc169a51e283c9612187140f5ceaba38efd8f Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Thu, 10 May 2018 09:14:57 +1000
Subject: [PATCH 102/172] Update password.php

---
 scripts/pi-hole/php/password.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index 3dc58e2a..c5c872c5 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -46,7 +46,9 @@
 	    {	$auth = true;
 		// Refresh cookie with new expiry
                 setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
+	    }
 	    else 
+	    {
 		// Invalid cookie 
 		$auth = false;
 		setcookie('persistentlogin', '');

From 5a473ecbdec026879ef59eda45fe1dc4212a292c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 10 May 2018 15:05:46 +0200
Subject: [PATCH 103/172] Add "api.php?topClientsBlocked"

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/api_FTL.php b/api_FTL.php
index e67405dc..041163f0 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -173,6 +173,38 @@ else
 		$data = array_merge($data, $result);
 	}
 
+	if (isset($_GET['topClientsBlocked']) && $auth)
+	{
+
+		if(isset($_GET['topClientsBlocked']))
+		{
+			$number = $_GET['topClientsBlocked'];
+		}
+
+		if(is_numeric($number))
+		{
+			sendRequestFTL("top-clients blocked (".$number.")");
+		}
+		else
+		{
+			sendRequestFTL("top-clients blocked");
+		}
+
+		$return = getResponseFTL();
+		$top_clients = array();
+		foreach($return as $line)
+		{
+			$tmp = explode(" ",$line);
+			if(count($tmp) > 3 && strlen($tmp[3]) > 0)
+				$top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
+			else
+				$top_clients[$tmp[2]] = intval($tmp[1]);
+		}
+
+		$result = array('top_sources_blocked' => $top_clients);
+		$data = array_merge($data, $result);
+	}
+
 	if (isset($_GET['getForwardDestinations']) && $auth)
 	{
 		if($_GET['getForwardDestinations'] === "unsorted")

From 73df3bddb6a23eb79fea80e93e9c71dc46eeff82 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 10 May 2018 15:11:22 +0200
Subject: [PATCH 104/172] Add "Top Clients (blocked only)" table

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php                   | 34 +++++++++++++++++++++++++---
 scripts/pi-hole/js/index.js | 44 ++++++++++++++++++++++++++++++++++---
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index fe028232..b75edec5 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
 *    Please see LICENSE file for your rights under this license. */
     $indexpage = true;
     require "scripts/pi-hole/php/header.php";
-    require_once("scripts/pi-hole/php/gravity.php"); 
+    require_once("scripts/pi-hole/php/gravity.php");
 ?>
 <!-- Small boxes (Stat box) -->
 <div class="row">
@@ -217,7 +217,7 @@ if($boxedlayout)
 }
 else
 {
-  $tablelayout = "col-md-6 col-lg-4";
+  $tablelayout = "col-md-6 col-lg-6";
 }
 ?>
 <div class="row">
@@ -278,7 +278,35 @@ else
     <div class="<?php echo $tablelayout; ?>">
       <div class="box" id="client-frequency">
         <div class="box-header with-border">
-          <h3 class="box-title">Top Clients</h3>
+          <h3 class="box-title">Top Clients (total)</h3>
+        </div>
+        <!-- /.box-header -->
+        <div class="box-body">
+            <div class="table-responsive">
+                <table class="table table-bordered">
+                  <tbody>
+                    <tr>
+                    <th>Client</th>
+                    <th>Requests</th>
+                    <th>Frequency</th>
+                    </tr>
+                  </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="overlay">
+          <i class="fa fa-refresh fa-spin"></i>
+        </div>
+        <!-- /.box-body -->
+      </div>
+      <!-- /.box -->
+    </div>
+    <!-- /.col -->
+    <!-- /.col -->
+    <div class="<?php echo $tablelayout; ?>">
+      <div class="box" id="client-frequency-blocked">
+        <div class="box-header with-border">
+          <h3 class="box-title">Top Clients (blocked only)</h3>
         </div>
         <!-- /.box-header -->
         <div class="box-body">
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 390c19b7..0fd513c4 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -360,7 +360,6 @@ function updateForwardedOverTime() {
     });
 }
 
-
 function updateClientsOverTime() {
     $.getJSON("api.php?overTimeDataClients&getClientNames", function(data) {
 
@@ -527,7 +526,7 @@ function escapeHtml(text) {
 }
 
 function updateTopClientsChart() {
-    $.getJSON("api.php?summaryRaw&getQuerySources", function(data) {
+    $.getJSON("api.php?summaryRaw&getQuerySources&topClientsBlocked", function(data) {
 
         if("FTLnotrunning" in data)
         {
@@ -566,17 +565,56 @@ function updateTopClientsChart() {
                     "</td> <td>" + data.top_sources[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + data.dns_queries_today + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
                     percentage + "%\"></div> </div> </td> </tr> ");
             }
+        }
 
+        // Clear tables before filling them with data
+        $("#client-frequency-blocked td").parent().remove();
+        var clientblockedtable =  $("#client-frequency-blocked").find("tbody:last");
+        var client, percentage, clientname, clientip;
+        for (client in data.top_sources_blocked) {
+
+            if ({}.hasOwnProperty.call(data.top_sources_blocked, client)){
+                // Sanitize client
+                if(escapeHtml(client) !== client)
+                {
+                    // Make a copy with the escaped index if necessary
+                    data.top_sources_blocked[escapeHtml(client)] = data.top_sources_blocked[client];
+                }
+                client = escapeHtml(client);
+                if(client.indexOf("|") > -1)
+                {
+                    var idx = client.indexOf("|");
+                    clientname = client.substr(0, idx);
+                    clientip = client.substr(idx+1, client.length-idx);
+                }
+                else
+                {
+                    clientname = client;
+                    clientip = client;
+                }
+
+                var url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
+                percentage = data.top_sources_blocked[client] / data.dns_queries_today * 100;
+                clientblockedtable.append("<tr> <td>" + url +
+                    "</td> <td>" + data.top_sources_blocked[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + data.dns_queries_today + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
+                    percentage + "%\"></div> </div> </td> </tr> ");
+            }
         }
 
         // Remove table if there are no results (e.g. privacy mode enabled)
         if(jQuery.isEmptyObject(data.top_sources))
         {
             $("#client-frequency").parent().remove();
-            return;
+        }
+
+        // Remove table if there are no results (e.g. privacy mode enabled)
+        if(jQuery.isEmptyObject(data.top_sources_blocked))
+        {
+            $("#client-frequency-blocked").parent().remove();
         }
 
         $("#client-frequency .overlay").hide();
+        $("#client-frequency-blocked .overlay").hide();
         // Update top clients list data every ten seconds
         setTimeout(updateTopClientsChart, 10000);
     });

From d42784be8cb98562be24bb577f981a14f0cec9ee Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 10 May 2018 15:22:00 +0200
Subject: [PATCH 105/172] Address codacy issues

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 0fd513c4..18f23724 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -535,8 +535,8 @@ function updateTopClientsChart() {
 
         // Clear tables before filling them with data
         $("#client-frequency td").parent().remove();
-        var clienttable =  $("#client-frequency").find("tbody:last");
-        var client, percentage, clientname, clientip;
+        var clienttable = $("#client-frequency").find("tbody:last");
+        var client, percentage, clientname, clientip, idx;
         for (client in data.top_sources) {
 
             if ({}.hasOwnProperty.call(data.top_sources, client)){
@@ -549,7 +549,7 @@ function updateTopClientsChart() {
                 client = escapeHtml(client);
                 if(client.indexOf("|") > -1)
                 {
-                    var idx = client.indexOf("|");
+                    idx = client.indexOf("|");
                     clientname = client.substr(0, idx);
                     clientip = client.substr(idx+1, client.length-idx);
                 }
@@ -569,8 +569,7 @@ function updateTopClientsChart() {
 
         // Clear tables before filling them with data
         $("#client-frequency-blocked td").parent().remove();
-        var clientblockedtable =  $("#client-frequency-blocked").find("tbody:last");
-        var client, percentage, clientname, clientip;
+        var clientblockedtable = $("#client-frequency-blocked").find("tbody:last");
         for (client in data.top_sources_blocked) {
 
             if ({}.hasOwnProperty.call(data.top_sources_blocked, client)){
@@ -583,7 +582,7 @@ function updateTopClientsChart() {
                 client = escapeHtml(client);
                 if(client.indexOf("|") > -1)
                 {
-                    var idx = client.indexOf("|");
+                    idx = client.indexOf("|");
                     clientname = client.substr(0, idx);
                     clientip = client.substr(idx+1, client.length-idx);
                 }

From 0d283bbfa240c090f79dba9b0198d8f534e60a19 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 10 May 2018 15:26:44 +0200
Subject: [PATCH 106/172] Address codacy issues

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 18f23724..68658e07 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -536,7 +536,7 @@ function updateTopClientsChart() {
         // Clear tables before filling them with data
         $("#client-frequency td").parent().remove();
         var clienttable = $("#client-frequency").find("tbody:last");
-        var client, percentage, clientname, clientip, idx;
+        var client, percentage, clientname, clientip, idx, url;
         for (client in data.top_sources) {
 
             if ({}.hasOwnProperty.call(data.top_sources, client)){
@@ -559,7 +559,7 @@ function updateTopClientsChart() {
                     clientip = client;
                 }
 
-                var url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
+                url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
                 percentage = data.top_sources[client] / data.dns_queries_today * 100;
                 clienttable.append("<tr> <td>" + url +
                     "</td> <td>" + data.top_sources[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + data.dns_queries_today + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
@@ -592,7 +592,7 @@ function updateTopClientsChart() {
                     clientip = client;
                 }
 
-                var url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
+                url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
                 percentage = data.top_sources_blocked[client] / data.dns_queries_today * 100;
                 clientblockedtable.append("<tr> <td>" + url +
                     "</td> <td>" + data.top_sources_blocked[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + data.dns_queries_today + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +

From 62f349b9966774262afa26c60931fb055974c7e4 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 10 May 2018 15:29:38 +0200
Subject: [PATCH 107/172] Top Clients (blocked): Compute frequency relative to
 number of blocked not total number of queries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 68658e07..4606dd48 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -593,7 +593,7 @@ function updateTopClientsChart() {
                 }
 
                 url = "<a href=\"queries.php?client="+clientip+"\" title=\""+clientip+"\">"+clientname+"</a>";
-                percentage = data.top_sources_blocked[client] / data.dns_queries_today * 100;
+                percentage = data.top_sources_blocked[client] / data.ads_blocked_today * 100;
                 clientblockedtable.append("<tr> <td>" + url +
                     "</td> <td>" + data.top_sources_blocked[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + data.dns_queries_today + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
                     percentage + "%\"></div> </div> </td> </tr> ");

From e28e9eabe391449ad5d91ea936036f2bb858caaf Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Sun, 13 May 2018 12:38:04 +0100
Subject: [PATCH 108/172] Force Top Clients and Top Clients Blocked onto a new
 row

Signed-off-by: Adam Warner <adamw@rner.email>
---
 index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/index.php b/index.php
index b75edec5..63583336 100644
--- a/index.php
+++ b/index.php
@@ -274,6 +274,8 @@ else
       </div>
       <!-- /.box -->
     </div>
+</div>
+<div class="row">
     <!-- /.col -->
     <div class="<?php echo $tablelayout; ?>">
       <div class="box" id="client-frequency">

From 72e95cec964c6e3c96d28b77d11c3a109ae1d751 Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 15 May 2018 09:03:09 +1000
Subject: [PATCH 109/172] indenting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/php/password.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index c5c872c5..36982b17 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -29,7 +29,7 @@
     {
         session_unset();
         setcookie('persistentlogin', '');
-	    header('Location: index.php');
+        header('Location: index.php');
         exit();
     }
 
@@ -43,16 +43,16 @@
         if (isset($_COOKIE["persistentlogin"]))
         {
             if ($pwhash = $_COOKIE["persistentlogin"])
-	    {	$auth = true;
+            { $auth = true;
 		// Refresh cookie with new expiry
                 setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
-	    }
-	    else 
-	    {
-		// Invalid cookie 
-		$auth = false;
-		setcookie('persistentlogin', '');
-	    }
+            }
+            else
+            {
+                // Invalid cookie
+                $auth = false;
+                setcookie('persistentlogin', '');
+            }
         }
         // Compare doubly hashes password input with saved hash
         else if(isset($_POST["pw"]))

From c2a9e80db6494c7d67fd4ad09ae161bf9e58146e Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 15 May 2018 09:05:19 +1000
Subject: [PATCH 110/172] indenting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/php/loginpage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 89bde7ab..f8e5e948 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -36,8 +36,8 @@
           </div>
           <div class="col-xs-4">
             <div class="form-group">
-            <div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div>
-            </div>
+              <div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div>
+              </div>
             <button type="submit" href="#" class="btn btn-primary pull-right"><i class="glyphicon glyphicon-log-in"></i>&nbsp;&nbsp;&nbsp;Log in</button>
           </div>
         </div>

From 30bef67a8846d1ad94aee223f3962e1e12950d21 Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 15 May 2018 10:55:46 +1000
Subject: [PATCH 111/172] indenting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/php/password.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index 36982b17..d62c1aa9 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -43,8 +43,9 @@
         if (isset($_COOKIE["persistentlogin"]))
         {
             if ($pwhash = $_COOKIE["persistentlogin"])
-            { $auth = true;
-		// Refresh cookie with new expiry
+            {
+                $auth = true;
+                // Refresh cookie with new expiry
                 setcookie('persistentlogin', $pwhash, time()+60*60*24*7);
             }
             else

From 967763b6dacedfae6d62f3078b957c35ec61c7a8 Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 15 May 2018 10:56:49 +1000
Subject: [PATCH 112/172] indenting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/php/loginpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index f8e5e948..b9128f8b 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -37,7 +37,7 @@
           <div class="col-xs-4">
             <div class="form-group">
               <div class="checkbox pull-right"><label><input type="checkbox" id="logincookie" name="persistentlogin">Remember me for 7 days</label></div>
-              </div>
+            </div>
             <button type="submit" href="#" class="btn btn-primary pull-right"><i class="glyphicon glyphicon-log-in"></i>&nbsp;&nbsp;&nbsp;Log in</button>
           </div>
         </div>

From 32c55577f1ea61eb822f4dabe69ac72908ad05a1 Mon Sep 17 00:00:00 2001
From: Mark Drobnak <newtoncat12@yahoo.com>
Date: Wed, 16 May 2018 11:27:54 -0400
Subject: [PATCH 113/172] Remove max line length in getResponseFTL

Fixes issue found on Discourse: https://discourse.pi-hole.net/t/9544

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/FTL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index 705aa8de..caddd758 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -37,7 +37,7 @@ function getResponseFTL()
 
 	while(true)
 	{
-		$out = fgets($socket, 128);
+		$out = fgets($socket);
 		if(strrpos($out,"---EOM---") !== false)
 			break;
 

From c8f0db326b55c51368e9dd0f05ecb712563b0797 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 24 May 2018 14:06:46 +0200
Subject: [PATCH 114/172] Remove ancient and completely outdated PHP-only API.
 Pi-hole v4.0 will only use the FTL-PHP API.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api.php                      |   9 +-
 api_PHP.php                  |  95 ----
 scripts/pi-hole/php/data.php | 822 -----------------------------------
 3 files changed, 1 insertion(+), 925 deletions(-)
 delete mode 100644 api_PHP.php
 delete mode 100644 scripts/pi-hole/php/data.php

diff --git a/api.php b/api.php
index db94d735..16964a04 100644
--- a/api.php
+++ b/api.php
@@ -75,14 +75,7 @@ elseif (isset($_GET['disable']) && $auth)
 }
 
 // Other API functions
-if(!isset($_GET["PHP"]))
-{
-	require("api_FTL.php");
-}
-else
-{
-	require("api_PHP.php");
-}
+require("api_FTL.php");
 
 if(isset($_GET["jsonForceObject"]))
 {
diff --git a/api_PHP.php b/api_PHP.php
deleted file mode 100644
index 52bbd613..00000000
--- a/api_PHP.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/* Pi-hole: A black hole for Internet advertisements
-*  (c) 2017 Pi-hole, LLC (https://pi-hole.net)
-*  Network-wide ad blocking via your own hardware.
-*
-*  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */
-
-
-    if(!isset($api))
-    {
-        die("Direct call to api_PHP.php is not allowed!");
-    }
-
-    include('scripts/pi-hole/php/data.php');
-    include_once('scripts/pi-hole/php/gravity.php');
-
-    // Non-Auth
-
-    if (isset($_GET['type'])) {
-        $data["type"] = "PHP";
-    }
-
-    if (isset($_GET['version'])) {
-        $data["version"] = 2;
-    }
-
-    if (isset($_GET['summaryRaw'])) {
-        $data = array_merge($data,  getSummaryData());
-    }
-
-    if (isset($_GET['summary']) || !count($_GET)) {
-        $sum = getSummaryData();
-        $sum['ads_blocked_today'] = number_format( $sum['ads_blocked_today']);
-        $sum['dns_queries_today'] = number_format( $sum['dns_queries_today']);
-        $sum['ads_percentage_today'] = number_format( $sum['ads_percentage_today'], 1, '.', '');
-        $sum['domains_being_blocked'] = number_format( $sum['domains_being_blocked']);
-        $sum['gravity_last_updated'] = gravity_last_update(true);
-        $data = array_merge($data,  $sum);
-    }
-
-    if (isset($_GET['overTimeData'])) {
-        $data = array_merge($data,  getOverTimeData());
-    }
-
-    if (isset($_GET['overTimeData10mins'])) {
-        $data = array_merge($data,  getOverTimeData10mins());
-    }
-
-    // Auth Required
-
-    if (isset($_GET['topItems']) && $auth) {
-        $data = array_merge($data,  getTopItems($_GET['topItems']));
-    }
-
-    if (isset($_GET['recentItems']) && $auth) {
-        if (is_numeric($_GET['recentItems'])) {
-            $data = array_merge($data,  getRecentItems($_GET['recentItems']));
-        }
-    }
-
-    if (isset($_GET['getQueryTypes']) && $auth) {
-        $data = array_merge($data, getIpvType());
-    }
-
-    if (isset($_GET['getForwardDestinations']) && $auth) {
-        $data = array_merge($data, getForwardDestinations());
-    }
-
-    if (isset($_GET['getQuerySources']) && $auth) {
-        $data = array_merge($data, getQuerySources());
-    }
-
-    if (isset($_GET['getAllQueries']) && $auth) {
-        $data = array_merge($data, getAllQueries($_GET['getAllQueries']));
-    }
-
-    if (isset($_GET['getGravityDomains'])) {
-        $data = array_merge($data, getGravity());
-    }
-
-    function filterArray(&$inArray) {
-        $outArray = array();
-        foreach ($inArray as $key=>$value) {
-            if (is_array($value)) {
-                $outArray[htmlspecialchars($key)] = filterArray($value);
-            } else {
-                $outArray[htmlspecialchars($key)] = !is_numeric($value) ? htmlspecialchars($value) : $value;
-            }
-        }
-        return $outArray;
-    }
-
-    $data = filterArray($data);
-?>
diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php
deleted file mode 100644
index f7226698..00000000
--- a/scripts/pi-hole/php/data.php
+++ /dev/null
@@ -1,822 +0,0 @@
-<?php
-/* Pi-hole: A black hole for Internet advertisements
-*  (c) 2017 Pi-hole, LLC (https://pi-hole.net)
-*  Network-wide ad blocking via your own hardware.
-*
-*  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */
-
-    $log = array();
-    $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
-
-    $hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
-
-    // Check if pihole.log exists and is readable
-    $logListName = checkfile("/var/log/pihole.log");
-    $log = new \SplFileObject($logListName);
-
-    // Check if preEventHorizon exists and is readable
-    $gravityListName = checkfile("/etc/pihole/list.preEventHorizon");
-    $gravity = new \SplFileObject($gravityListName);
-
-    // whitelist.txt is optional and might not be there
-    $whiteListFile = checkfile("/etc/pihole/whitelist.txt");
-    $whitelist = new \SplFileObject($whiteListFile);
-
-    // blacklist.txt is optional and might not be there
-    $blackListFile = checkfile("/etc/pihole/blacklist.txt");
-    $blacklist = new \SplFileObject($blackListFile);
-
-    if(isset($setupVars["API_PRIVACY_MODE"]))
-    {
-        $privacyMode = $setupVars["API_PRIVACY_MODE"];
-    }
-    else
-    {
-        $privacyMode = false;
-    }
-
-    // Check if time zone is set
-    // https://github.com/pi-hole/AdminLTE/pull/394
-    if (!date_default_timezone_get("date.timezone")) {
-        date_default_timezone_set("UTC");
-    }
-
-    /*******   Public Members ********/
-    function getSummaryData() {
-        $domains_being_blocked = gravityCount();
-
-        $dns_queries_today = countDnsQueries();
-
-        $ads_blocked_today = countBlockedQueries();
-
-        $ads_percentage_today = $dns_queries_today > 0 ? ($ads_blocked_today / $dns_queries_today * 100) : 0;
-
-        return array(
-            'domains_being_blocked' => $domains_being_blocked,
-            'dns_queries_today' => $dns_queries_today,
-            'ads_blocked_today' => $ads_blocked_today,
-            'ads_percentage_today' => $ads_percentage_today,
-        );
-    }
-
-    function getOverTimeData() {
-        global $log;
-
-        // Get log lines
-        $dns_queries = getDnsQueries($log);
-
-        // Get list of ad domains
-        $gravity_domains = getGravity();
-
-        // Bin log entries separated into Domains and Ads in 1 hour intervals
-        list($domains_over_time, $ads_over_time) = overTime($dns_queries, $gravity_domains);
-
-        // Align arrays
-        alignTimeArrays($ads_over_time, $domains_over_time);
-
-        // Provide a minimal valid array if there have are no blocked
-        // queries at all. Otherwise the output of the API is inconsistent.
-        if(count($ads_over_time) == 0)
-        {
-            $ads_over_time = [1 => 0];
-        }
-
-        return Array(
-            'domains_over_time' => $domains_over_time,
-            'ads_over_time' => $ads_over_time,
-        );
-    }
-
-    function getOverTimeData10mins() {
-        global $log;
-
-        // Get log lines
-        $dns_queries = getDnsQueries($log);
-
-        // Get list of ad domains
-        $gravity_domains = getGravity();
-
-        // Bin log entries separated into Domains and Ads in 10 minute intervals
-        list($domains_over_time, $ads_over_time) = overTime10mins($dns_queries, $gravity_domains);
-
-        // Align arrays (in case there have been hours without ad queries)
-        alignTimeArrays($ads_over_time, $domains_over_time);
-
-        // Provide a minimal valid array if there have are no blocked
-        // queries at all. Otherwise the output of the API is inconsistent.
-        if(count($ads_over_time) == 0)
-        {
-            $ads_over_time = [1 => 0];
-        }
-
-        return Array(
-            'domains_over_time' => $domains_over_time,
-            'ads_over_time' => $ads_over_time,
-        );
-    }
-
-    // Test if variable exists and is positive
-    function ispositive(&$arg)
-    {
-        if(isset($arg))
-        {
-            if($arg > 0)
-            {
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }
-
-    function getTopItems($argument) {
-        global $log,$setupVars,$privacyMode;
-
-        // Process log file
-        $dns_domains = getDnsQueryDomains($log);
-        // Get list of ad domains
-        $gravity_domains = getGravity();
-
-        // Exclude domains the user doesn't want to see
-        if(isset($setupVars["API_EXCLUDE_DOMAINS"]))
-        {
-            excludeFromList($dns_domains, "API_EXCLUDE_DOMAINS");
-        }
-
-        // Sort array in descending order
-        arsort($dns_domains);
-
-        // Prepare arrays and counters for Top Items
-        $topDomains = []; $domaincounter = 0;
-        $topAds = []; $adcounter = 0;
-
-        // Default number of Top Items to show is 10
-        $qty = 10;
-
-        // If argument is numeric, the user may want to
-        // see a different number of entries
-        if(is_numeric($argument))
-        {
-            $qty = intval($argument);
-        }
-
-        // Process sorted domain names
-        foreach ($dns_domains as $key => $value) {
-            if(ispositive($gravity_domains[$key]) && $adcounter < $qty)
-            {
-                // New entry for Top Ads
-                $topAds[$key] = $value;
-                $adcounter++;
-            }
-            else if($domaincounter < $qty && !$privacyMode)
-            {
-                // New entry for Top Domains
-                $topDomains[$key] = $value;
-                $domaincounter++;
-            }
-            elseif($domaincounter >= $qty && $adcounter >= $qty)
-            {
-                // Already collected enough entries for both lists
-                // Exit loop early
-                break;
-            }
-        }
-
-        return Array(
-            'top_queries' => $topDomains,
-            'top_ads' => $topAds,
-        );
-    }
-
-    function getRecentItems($qty) {
-        global $log;
-        $dns_queries = getDnsQueries($log);
-        return Array(
-            'recent_queries' => getRecent($dns_queries, $qty)
-        );
-    }
-
-    function getIpvType() {
-        global $log;
-        $dns_queries = getDnsQueries($log);
-        $queryTypes = array();
-
-        foreach($dns_queries as $query) {
-            $info = trim(explode(": ", $query)[1]);
-            $queryType = explode(" ", $info)[0];
-            if (isset($queryTypes[$queryType])) {
-                $queryTypes[$queryType]++;
-            }
-            else {
-                $queryTypes[$queryType] = 1;
-            }
-        }
-
-        return $queryTypes;
-    }
-
-    function resolveIPs(&$array) {
-        $hostarray = [];
-        foreach ($array as $key => $value)
-        {
-            $hostname = gethostbyaddr($key);
-            // If we found a hostname for the IP, replace it
-            if($hostname)
-            {
-                // Generate HOST entry
-                $hostarray["$hostname|$key"] = $value;
-            }
-            else
-            {
-                // Generate IP entry
-                $hostarray[$key] = $value;
-            }
-        }
-        $array = $hostarray;
-
-        // Sort new array
-        arsort($array);
-    }
-
-    function getForwardDestinations() {
-        global $log, $setupVars;
-        $forwards = getForwards($log);
-        $destinations = array();
-        foreach ($forwards as $forward) {
-            $exploded = explode(" ", trim($forward));
-            $dest = $exploded[count($exploded) - 1];
-            if (isset($destinations[$dest])) {
-                $destinations[$dest]++;
-            }
-            else {
-                $destinations[$dest] = 1;
-            }
-        }
-
-        if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"]))
-        {
-            resolveIPs($destinations);
-        }
-
-        return $destinations;
-
-    }
-
-    // Check for existance of variable
-    // and test it only if it exists
-    function istrue(&$argument) {
-        $ret = false;
-        if(isset($argument))
-        {
-            if($argument)
-            {
-                $ret = true;
-            }
-        }
-        return $ret;
-    }
-
-    function getQuerySources() {
-        global $log, $setupVars;
-        $dns_queries = getDnsQueries($log);
-        $sources = array();
-        foreach($dns_queries as $query) {
-            $exploded = explode(" ", $query);
-            $ip = trim($exploded[count($exploded)-1]);
-            if (isset($sources[$ip])) {
-                $sources[$ip]++;
-            }
-            else {
-                $sources[$ip] = 1;
-            }
-        }
-
-        global $setupVars;
-        if(isset($setupVars["API_EXCLUDE_CLIENTS"]))
-        {
-            excludeFromList($sources, "API_EXCLUDE_CLIENTS");
-        }
-
-        arsort($sources);
-        $sources = array_slice($sources, 0, 10);
-
-        if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"]))
-        {
-            resolveIPs($sources);
-        }
-
-        return Array(
-            'top_sources' => $sources
-        );
-    }
-
-    $showBlocked = false;
-    $showPermitted = false;
-
-    function setShowBlockedPermitted()
-    {
-        global $showBlocked, $showPermitted, $setupVars;
-        if(isset($setupVars["API_QUERY_LOG_SHOW"]))
-        {
-            if($setupVars["API_QUERY_LOG_SHOW"] === "all")
-            {
-                $showBlocked = true;
-                $showPermitted = true;
-            }
-            elseif($setupVars["API_QUERY_LOG_SHOW"] === "permittedonly")
-            {
-                $showBlocked = false;
-                $showPermitted = true;
-            }
-            elseif($setupVars["API_QUERY_LOG_SHOW"] === "blockedonly")
-            {
-                $showBlocked = true;
-                $showPermitted = false;
-            }
-            elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing")
-            {
-                $showBlocked = false;
-                $showPermitted = false;
-            }
-            else
-            {
-                // Invalid settings, show everything
-                $showBlocked = true;
-                $showPermitted = true;
-            }
-        }
-        else
-        {
-            $showBlocked = true;
-            $showPermitted = true;
-        }
-    }
-
-    function getAllQueries($orderBy) {
-        global $log,$showBlocked,$showPermitted,$privacyMode,$setupVars;
-        $allQueries = array("data" => array());
-        $dns_queries = getDnsQueries($log);
-
-        $hostnames=array();
-
-        // Create empty array for gravity
-        $gravity_domains = getGravity();
-        $wildcard_domains = getWildcardListContent();
-
-        if(isset($_GET["from"]))
-        {
-            $from = new DateTime($_GET["from"]);
-        }
-        if(isset($_GET["until"]))
-        {
-            $until = new DateTime($_GET["until"]);
-        }
-
-        setShowBlockedPermitted();
-
-        // Privacy mode?
-        if($privacyMode)
-        {
-            $showPermitted = false;
-        }
-
-        if(!$showBlocked && !$showPermitted)
-        {
-            // Nothing to do for us here
-            return [];
-        }
-
-        foreach ($dns_queries as $query) {
-            $time = new DateTime(substr($query, 0, 16));
-
-            // Check if we want to restrict the time where we want to show queries
-            if(isset($from))
-            {
-                if($time <= $from)
-                {
-                    continue;
-                }
-            }
-            if(isset($until))
-            {
-                if($time >= $until)
-                {
-                    continue;
-                }
-            }
-
-           // print_r([$time->getTimestamp(),$_GET["from"],$_GET["until"]]);
-
-            $exploded = explode(" ", trim($query));
-            $domain = $exploded[count($exploded)-3];
-
-            $status = "";
-
-            if(isset($gravity_domains[$domain]))
-            {
-                if($gravity_domains[$domain] > 0)
-                {
-                    // Exact matching gravity domain
-                    $status = "Pi-holed (exact)";
-                }
-                else
-                {
-                    // Explicitly whitelisted
-                    $status = "OK (whitelisted)";
-                }
-            }
-            else
-            {
-                // Test for wildcard blocking
-                foreach ($wildcard_domains as $entry) {
-                    if(strpos($domain, $entry) !== false)
-                    {
-                        $status = "Pi-holed (wildcard)";
-                    }
-                }
-                if(!strlen($status))
-                {
-                    $status = "OK";
-                }
-            }
-            if((substr($status,0,2) === "Pi" && $showBlocked) || (substr($status,0,2) === "OK" && $showPermitted))
-            {
-                $type = substr($exploded[count($exploded)-4], 6, -1);
-
-                if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"])) {
-                    $ip = $exploded[count($exploded) - 1];
-
-                    if (isset($hostnames[$ip])) {
-                        $client = $hostnames[$ip];
-                    } else {
-                        $hostnames[$ip] = gethostbyaddr($ip);
-                        $client = $hostnames[$ip];
-                    }
-                }
-                else
-                {
-                    $client = $exploded[count($exploded)-1];
-                }
-
-                if($orderBy == "orderByClientDomainTime"){
-                  $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d T H:i:s')] = $status;
-                }elseif ($orderBy == "orderByClientTimeDomain"){
-                  $allQueries['data'][hasHostName($client)][$time->format('Y-m-d T H:i:s')][$domain] = $status;
-                }elseif ($orderBy == "orderByTimeClientDomain"){
-                  $allQueries['data'][$time->format('Y-m-d T H:i:s')][hasHostName($client)][$domain] = $status;
-                }elseif ($orderBy == "orderByTimeDomainClient"){
-                  $allQueries['data'][$time->format('Y-m-d T H:i:s')][$domain][hasHostName($client)] = $status;
-                }elseif ($orderBy == "orderByDomainClientTime"){
-                  $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d T H:i:s')] = $status;
-                }elseif ($orderBy == "orderByDomainTimeClient"){
-                  $allQueries['data'][$domain][$time->format('Y-m-d T H:i:s')][hasHostName($client)] = $status;
-                }else{
-                  array_push($allQueries['data'], array(
-                    $time->format('Y-m-d T H:i:s'),
-                    $type,
-                    $domain,
-                    hasHostName($client),
-                    $status,
-                    ""
-                  ));
-                }
-            }
-        }
-
-        return $allQueries;
-    }
-
-    function tailPiholeLog($param) {
-        // Not using SplFileObject here, since direct
-        // usage of f-streams will be much faster for
-        // files as large as the pihole.log
-        global $logListName;
-        $file = fopen($logListName,"r");
-        $offset = intval($param);
-        if($offset > 0)
-        {
-            // Seeks on the file pointer where we want to continue reading is known
-            fseek($file, $offset);
-            $lines = [];
-            while (!feof($file)) {
-                array_push($lines,fgets($file));
-            }
-            return ["offset" => ftell($file), "lines" => $lines];
-        }
-        else
-        {
-            // Locate the current position of the file read/write pointer
-            fseek($file, -1, SEEK_END);
-            // Add one to skip the very last "\n" in the log file
-            return ["offset" => ftell($file)+1];
-        }
-        fclose($file);
-    }
-
-    /******** Private Members ********/
-    function gravityCount() {
-        global $gravityListName,$blackListFile;
-        $preEventHorizon = exec("grep -c ^ $gravityListName");
-        $blacklist = exec("grep -c ^ $blackListFile");
-        return ($preEventHorizon + $blacklist);
-    }
-
-    function getDnsQueries(\SplFileObject $log) {
-        $log->rewind();
-        $lines = [];
-        foreach ($log as $line) {
-            if(strpos($line, ": query[A") !== false) {
-                $lines[] = $line;
-            }
-        }
-        return $lines;
-    }
-
-    function getDnsQueryDomains(\SplFileObject $log) {
-        $log->rewind();
-        $domains = [];
-        foreach ($log as $line) {
-            if(strpos($line, ": query[A") !== false) {
-                $exploded = explode(" ", $line);
-                $domain = trim($exploded[count($exploded) - 3]);
-                if (isset($domains[$domain])) {
-                    $domains[$domain]++;
-                }
-                else {
-                    $domains[$domain] = 1;
-                }
-            }
-        }
-        return $domains;
-    }
-
-    function countDnsQueries() {
-        global $logListName;
-        return intval(exec("grep -c \": query\\[A\" $logListName"));
-    }
-
-    function getDnsQueriesAll(\SplFileObject $log) {
-        $log->rewind();
-        $lines = [];
-        foreach ($log as $line) {
-            if(strpos($line, ": query[A") || strpos($line, "gravity.list") || strpos($line, ": forwarded") !== false) {
-                $lines[] = $line;
-            }
-        }
-        return $lines;
-    }
-
-    function getDomains($file, &$array, $action){
-        $file->rewind();
-        foreach ($file as $line) {
-            // Strip newline (and possibly carriage return) from end of key
-            $key = rtrim($line);
-            // if $action = true -> we want that domain to be ADDED to the list
-            // doesn't harm to do this if it has already been set before
-            // (e.g. once in gravity list, once in blacklist)
-            if($action && strlen($key) > 0)
-            {
-                // $action is true (we want to add) *and* key is not empty
-                $array[$key] = 1;
-            }
-            elseif(!$action && isset($array[$key]))
-            {
-                // $action is false (we want to remove) *and* key is set
-                $array[$key] = -1;
-            }
-        }
-    }
-
-    function getWildcardListContent() {
-        $rawList = file_get_contents(checkfile("/etc/dnsmasq.d/03-pihole-wildcard.conf"));
-        $wclist = explode("\n", $rawList);
-        $list = [];
-
-        foreach ($wclist as $entry) {
-            $expl = explode("/", $entry);
-            if(count($expl) == 3)
-            {
-                array_push($list,$expl[1]);
-            }
-        }
-
-        return array_unique($list);
-
-    }
-
-    function getGravity() {
-        global $gravity,$whitelist,$blacklist;
-        $domains = [];
-
-        // ADD (true) preEventHorizon domains
-        getDomains($gravity, $domains, true);
-
-        // ADD (true) blacklist domains
-        getDomains($blacklist, $domains, true);
-
-        // REMOVE (false) whitelist domains
-        getDomains($whitelist, $domains, false);
-
-        return $domains;
-    }
-
-    function getBlockedQueries(\SplFileObject $log) {
-        $log->rewind();
-        $lines = [];
-        foreach ($log as $line) {
-            $exploded = explode(" ", str_replace("  "," ",$line));
-            if(count($exploded) == 8 || count($exploded) == 10) {
-                // Structure of data is currently like:
-                // Array
-                // (
-                //     [0] => Dec
-                //     [1] => 19
-                //     [2] => 11:21:51
-                //     [3] => dnsmasq[2584]:
-                //     [4] => /etc/pihole/gravity.list
-                //     [5] => doubleclick.com
-                //     [6] => is
-                //     [7] => ip.of.pi.hole
-                // )
-                // with extra logging enabled
-                // Array
-                // (
-                //     [0] => Dec
-                //     [1] => 19
-                //     [2] => 11:21:51
-                //     [3] => dnsmasq[2584]:
-                //     [4] => 1 (identifier)
-                //     [5] => 1.2.3.4/12345
-                //     [6] => /etc/pihole/gravity.list
-                //     [7] => doubleclick.com
-                //     [8] => is
-                //     [9] => ip.of.pi.hole
-                // )
-                $list = $exploded[count($exploded)-4];
-                $is = $exploded[count($exploded)-2];
-                // Consider only gravity.list as DNS source (not e.g. hostname.list)
-                if(substr($list, strlen($list) - 12, 12) === "gravity.list" && $is === "is") {
-                    $lines[] = $line;
-                };
-            }
-        }
-        return $lines;
-    }
-
-    function countBlockedQueries() {
-        global $logListName;
-        // Blocked due to gravity entries (ad lists + blacklist)
-        $gravityblocked = intval(exec("grep -c -e \"gravity\.list.*is\" $logListName"));
-
-        // Blocked due to wildcard entries
-        $wildcard_domains = getWildcardListContent();
-        $wildcardblocked = 0;
-        foreach ($wildcard_domains as $domain) {
-            $wildcardblocked += intval(exec("grep -c -e \"config.*$domain is\" $logListName"));
-        }
-
-        return  $gravityblocked +$wildcardblocked;
-    }
-
-    function getForwards(\SplFileObject $log) {
-        $log->rewind();
-        $lines = [];
-        foreach ($log as $line) {
-            if(strpos($line, ": forwarded") !== false) {
-                $lines[] = $line;
-            }
-        }
-        return $lines;
-    }
-
-    function excludeFromList(&$array,$key)
-    {
-        global $setupVars;
-        $domains = explode(",",$setupVars[$key]);
-        foreach ($domains as $domain) {
-            if(isset($array[$domain]))
-            {
-                unset($array[$domain]);
-            }
-        }
-        return $array;
-    }
-
-    function overTime($entries, $gravity_domains) {
-        $byTimeDomains = [];
-        $byTimeAds = [];
-        foreach ($entries as $entry) {
-            $time = date_create(substr($entry, 0, 16));
-            $hour = $time->format('G');
-
-            $exploded = explode(" ", $entry);
-            $domain = trim($exploded[count($exploded) - 3]);
-
-            if(ispositive($gravity_domains[$domain]))
-            {
-                if (isset($byTimeAds[$time])) {
-                    $byTimeAds[$time]++;
-                }
-                else {
-                    $byTimeAds[$time] = 1;
-                }
-            }
-
-            if (isset($byTimeDomains[$time])) {
-                $byTimeDomains[$time]++;
-            }
-            else {
-                $byTimeDomains[$time] = 1;
-            }
-        }
-        return [$byTimeDomains,$byTimeAds];
-    }
-
-    function overTime10mins($entries, $gravity_domains=[]) {
-        $byTimeDomains = [];
-        $byTimeAds = [];
-        foreach ($entries as $entry) {
-            $time = date_create(substr($entry, 0, 16));
-            $hour = $time->format('G');
-            $minute = $time->format('i');
-
-            // 00:00 - 00:09 -> 0
-            // 00:10 - 00:19 -> 1
-            // ...
-            // 12:00 - 12:10 -> 72
-            // ...
-            // 15:30 - 15:39 -> 93
-            // etc.
-            $time = ($minute-$minute%10)/10 + 6*$hour;
-
-            $exploded = explode(" ", $entry);
-            $domain = trim($exploded[count($exploded) - 3]);
-
-            if(ispositive($gravity_domains[$domain]))
-            {
-                if (isset($byTimeAds[$time])) {
-                    $byTimeAds[$time]++;
-                }
-                else {
-                    $byTimeAds[$time] = 1;
-                }
-            }
-
-            if (isset($byTimeDomains[$time])) {
-                $byTimeDomains[$time]++;
-            }
-            else {
-                $byTimeDomains[$time] = 1;
-            }
-        }
-        return [$byTimeDomains,$byTimeAds];
-    }
-
-    function alignTimeArrays(&$times1, &$times2) {
-        if(count($times1) == 0 || count($times2) < 2) {
-            return;
-        }
-
-        $max = max(array_merge(array_keys($times1), array_keys($times2)));
-        $min = min(array_merge(array_keys($times1), array_keys($times2)));
-
-        for ($i = $min; $i <= $max; $i++) {
-            if (!isset($times2[$i])) {
-                $times2[$i] = 0;
-            }
-            if (!isset($times1[$i])) {
-                $times1[$i] = 0;
-            }
-        }
-
-        ksort($times1);
-        ksort($times2);
-    }
-
-    function getRecent($queries, $qty){
-        $recent = array();
-        foreach (array_slice($queries, -$qty) as $query) {
-            $queryArray = array();
-            $exploded = explode(" ", $query);
-            $time = date_create(substr($query, 0, 16));
-            $queryArray['time'] = $time->format('h:i:s a');
-            $queryArray['domain'] = trim($exploded[count($exploded) - 3]);
-            $queryArray['ip'] = trim($exploded[count($exploded)-1]);
-            array_push($recent, $queryArray);
-
-        }
-        return array_reverse($recent);
-    }
-
-    function hasHostName($var){
-        global $hosts;
-        foreach ($hosts as $host){
-            $x = preg_split('/\s+/', $host);
-            if ( $var == $x[0] ){
-                $var = $x[1] . "($var)";
-            }
-        }
-        return $var;
-    }
-?>

From c6f5c2ee35d33cbc4c9ff8f58a402d3f9e5741e7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 25 May 2018 09:53:30 +0200
Subject: [PATCH 115/172] Display new dns_queries_all_types value (if
 available)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 index.php                   | 2 +-
 scripts/pi-hole/js/index.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 63583336..33d08c5e 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
 <div class="row">
     <div class="col-lg-3 col-xs-12">
         <!-- small box -->
-        <div class="small-box bg-green">
+        <div class="small-box bg-green" id="total_queries" title="only A + AAAA queries">
             <div class="inner">
                 <p>Total queries (<span id="unique_clients">-</span> clients)</p>
                 <h3 class="statistic"><span id="dns_queries_today">---</span></h3>
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 4606dd48..72fd10f5 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -739,6 +739,11 @@ function updateSummaryData(runOnce) {
             $("span#" + today).addClass("glow");
         });
 
+        if(data.hasOwnProperty("dns_queries_all_types"))
+        {
+            $("#total_queries").prop("title", "only A + AAAA queries (" + data["dns_queries_all_types"] + " in total)");
+        }
+
         window.setTimeout(function() {
             ["ads_blocked_today", "dns_queries_today", "domains_being_blocked", "ads_percentage_today", "unique_clients"].forEach(function(header, idx) {
                 var textData = (idx === 3 && data[header] !== "to") ? data[header] + "%" : data[header];

From 0fd0061e73356907b24b3ce945762c2419a97a0f Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Sat, 26 May 2018 20:25:34 +1000
Subject: [PATCH 116/172] Fix query sorting by Reply, DNSSEC and Action

orderData added to column specifications, allowing sorting to work when storage and display columns do not match.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/js/queries.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 6921c6b5..26fee4e0 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -267,10 +267,10 @@ $(document).ready(function() {
             { "width" : "4%" },
             { "width" : "36%", "render": $.fn.dataTable.render.text() },
             { "width" : "8%", "render": $.fn.dataTable.render.text() },
-            { "width" : "10%" },
-            { "width" : "8%" },
-            { "width" : "4%" },
-            { "width" : "10%" }
+            { "width" : "10%", "orderData": 4 },
+            { "width" : "8%", "orderData": 6 },
+            { "width" : "4%", "orderData": 5 },
+            { "width" : "10%", "orderData": 4 }
         ],
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
         "columnDefs": [ {

From 49d6feb4c380730f6f1f00074f86b6e8d95e2c10 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <Kev.Kirsche@gmail.com>
Date: Sat, 26 May 2018 15:49:19 -0400
Subject: [PATCH 117/172] Fix 579 | Add interface option for administrator
 email address (Redo of #757)

Signed-off-by: Kevin Kirsche <Kev.Kirsche@gmail.com>
---
 scripts/pi-hole/php/savesettings.php | 13 +++++++++++++
 settings.php                         | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 3599b92c..c1226fd5 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -452,6 +452,19 @@ function readAdlists()
 				{
 					exec('sudo pihole -a -c');
 				}
+				$adminemail = trim($_POST["adminemail"]);
+				if(strlen($adminemail) == 0 || !isset($adminemail))
+				{
+					$adminemail = 'noadminemail';
+				}
+				elseif(!filter_var($adminemail, FILTER_VALIDATE_EMAIL))
+				{
+					$error .= "Administrator email address (".htmlspecialchars($adminemail).") is invalid!<br>";
+				}
+				else
+				{
+					exec('sudo pihole -a -e '.$adminemail);
+				}
 				if(isset($_POST["boxedlayout"]))
 				{
 					exec('sudo pihole -a layout boxed');
diff --git a/settings.php b/settings.php
index 85aa9dfa..3e64ec79 100644
--- a/settings.php
+++ b/settings.php
@@ -880,6 +880,13 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                 } else {
                     $temperatureunit = "C";
                 }
+
+                // Administrator email address
+                if (isset($setupVars["ADMIN_EMAIL"])) {
+                    $adminemail = $setupVars["ADMIN_EMAIL"];
+                } else {
+                    $adminemail = "";
+                }
                 ?>
                 <div id="api" class="tab-pane fade<?php if($tab === "api"){ ?> in active<?php } ?>">
                     <div class="row">
@@ -978,6 +985,13 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                                       ?>>Fahrenheit</label>
                                                     </div>
                                                 </div>
+                                                <h4>Administrator Email Address</h4>
+                                                <div class="form-group">
+                                                    <div class="input-group">
+                                                        <input type="text" class="form-control" name="adminemail"
+                                                               value="<?php echo htmlspecialchars($adminemail); ?>">
+                                                    </div>
+                                                </div>
                                                 <input type="hidden" name="field" value="webUI">
                                                 <input type="hidden" name="token" value="<?php echo $token ?>">
                                             </div>

From b2743ed2453596658f17b74c5223267eb2e2f2f1 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 28 May 2018 17:42:11 +0200
Subject: [PATCH 118/172] Fix a minor bug with api.php?getClientNames when
 hostnames are present more than once on the local network (maybe once IPv6,
 once IPv4)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_FTL.php                 | 6 ++----
 scripts/pi-hole/js/index.js | 7 +------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index 041163f0..d2966f34 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -354,10 +354,8 @@ else
 		foreach($return as $line)
 		{
 			$tmp = explode(" ",$line);
-			if(count($tmp) > 3 && strlen($tmp[3]) > 0)
-				$client_names[$tmp[3]."|".$tmp[2]] = floatval($tmp[1]);
-			else
-				$client_names[$tmp[2]] = floatval($tmp[1]);
+			// returned data is in format: "ID count hostname"
+			$client_names[intval($tmp[0])] = $tmp[2];
 		}
 
 		$result = array('clients' => $client_names);
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 4606dd48..2960bdde 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -386,12 +386,7 @@ function updateClientsOverTime() {
         for (key in data.clients)
         {
             if (!{}.hasOwnProperty.call(data.clients, key)) continue;
-            if(key.indexOf("|") > -1)
-            {
-                var idx = key.indexOf("|");
-                key = key.substr(0, idx);
-            }
-            labels.push(key);
+            labels.push(data.clients[key]);
         }
         // Get colors from AdminLTE
         var colors = [];

From 96039f52a57085e7c93d398fff0ccdd2e51552ed Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Fri, 1 Jun 2018 09:52:07 +1000
Subject: [PATCH 119/172] fix typo in cookie check

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 scripts/pi-hole/php/password.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index d62c1aa9..ed95ca31 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -42,7 +42,7 @@
         // Check for and authorize from persistent cookie 
         if (isset($_COOKIE["persistentlogin"]))
         {
-            if ($pwhash = $_COOKIE["persistentlogin"])
+            if ($pwhash === $_COOKIE["persistentlogin"])
             {
                 $auth = true;
                 // Refresh cookie with new expiry

From a92604999b89134363be7719fd287b04004b119f Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 11:18:11 +0200
Subject: [PATCH 120/172] Show error/warning messages generated by PHP.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/settings.php b/settings.php
index 84b4e656..8715e016 100644
--- a/settings.php
+++ b/settings.php
@@ -19,6 +19,13 @@ else
 	$piholeFTLConf = array();
 }
 
+// Handling of PHP internal errors
+$last_error = error_get_last();
+if($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR)
+{
+	$error .= "PHP error (".htmlspecialchars($last_error["type"])."): ".htmlspecialchars($last_error["message"])." in ".htmlspecialchars($last_error["file"]).":".htmlspecialchars($last_error["line"]);
+}
+
 ?>
 <style type="text/css">
 	.tooltip-inner {

From 80017e9b41c6b86731b5220ab6215f0f90bbd1d0 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 11:19:16 +0200
Subject: [PATCH 121/172] Remove auto-dismissal for error messages on the
 settings page

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/settings.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 7fa1227b..6660c63a 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -209,16 +209,11 @@ $(".nav-tabs a").on("shown.bs.tab", function (e) {
     window.scrollTo(0, 0);
 });
 
-// Auto dismissal for info and error notifications
+// Auto dismissal for info notifications
 $(document).ready(function(){
     var alInfo = $("#alInfo");
-    var alError = $("#alError");
     if(alInfo.length)
     {
         alInfo.delay(3000).fadeOut(2000, function() { alInfo.hide(); });
     }
-    if(alError.length)
-    {
-        alError.delay(3000).fadeOut(2000, function() { alError.hide(); });
-    }
 });

From 2df0c217538593db3e924007e3869b179d6a92f9 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 11:32:33 +0200
Subject: [PATCH 122/172] Remove extra DNSSEC column. Instead, we integrate the
 DNSSEC result into the STATUS column if available.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 queries.php                   |  2 -
 scripts/pi-hole/js/queries.js | 74 ++++++++++++++++-------------------
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/queries.php b/queries.php
index 616696ed..09819465 100644
--- a/queries.php
+++ b/queries.php
@@ -140,7 +140,6 @@ if(strlen($showing) > 0)
                         <th>Client</th>
                         <th>Status</th>
                         <th>Reply</th>
-                        <th>DNSSEC</th>
                         <th>Action</th>
                     </tr>
                 </thead>
@@ -152,7 +151,6 @@ if(strlen($showing) > 0)
                         <th>Client</th>
                         <th>Status</th>
                         <th>Reply</th>
-                        <th>DNSSEC</th>
                         <th>Action</th>
                     </tr>
                 </tfoot>
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 26fee4e0..f5d7b46d 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -145,72 +145,65 @@ $(document).ready(function() {
     tableApi = $("#all-queries").DataTable( {
         "rowCallback": function( row, data, index ){
             var blocked = false;
+
+            $dnssec_status = "";
+            if (data[5] === "1")
+            {
+                $dnssec_status = "<br><span style=\"color:green\">SECURE</span>";
+            }
+            else if (data[5] === "2")
+            {
+                $dnssec_status = "<br><span style=\"color:orange\">INSECURE</span>";
+            }
+            else if (data[5] === "3")
+            {
+                $dnssec_status = "<br><span style=\"color:red\">BOGUS</span>";
+            }
+            else if (data[5] === "4")
+            {
+                $dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
+            }
+            else if (data[5] === "5")
+            {
+                $dnssec_status = "<br><span style=\"color:red\">?</span>";
+            }
             if (data[4] === "1")
             {
                 blocked = true;
                 $(row).css("color","red");
-                $("td:eq(4)", row).html( "Pi-holed" );
-                $("td:eq(7)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
+                $("td:eq(4)", row).html( "Pi-holed"+$dnssec_status );
+                $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else if (data[4] === "2")
             {
                 $(row).css("color","green");
-                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(forwarded)" );
-                $("td:eq(7)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
+                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(forwarded)"+$dnssec_status );
+                $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "3")
             {
                 $(row).css("color","green");
-                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(cached)" );
-                $("td:eq(7)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
+                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(cached)"+$dnssec_status );
+                $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "4")
             {
                 blocked = true;
                 $(row).css("color","red");
-                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)" );
-                $("td:eq(7)", row).html( "" );
+                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)"+$dnssec_status );
+                $("td:eq(6)", row).html( "" );
             }
             else if (data[4] === "5")
             {
                 blocked = true;
                 $(row).css("color","red");
                 $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(blacklist)" );
-                $("td:eq(7)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
+                $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else
             {
                 $("td:eq(4)", row).html( "Unknown" );
-                $("td:eq(7)", row).html( "" );
-            }
-            if (data[5] === "1")
-            {
-                $("td:eq(6)", row).css("color","green");
-                $("td:eq(6)", row).html( "SECURE" );
-            }
-            else if (data[5] === "2")
-            {
-                $("td:eq(6)", row).css("color","orange");
-                $("td:eq(6)", row).html( "INSECURE" );
-            }
-            else if (data[5] === "3")
-            {
-                $("td:eq(6)", row).css("color","red");
-                $("td:eq(6)", row).html( "BOGUS" );
-            }
-            else if (data[5] === "4")
-            {
-                $("td:eq(6)", row).css("color","red");
-                $("td:eq(6)", row).html( "ABANDONED" );
-            }
-            else if (data[5] === "5")
-            {
-                $("td:eq(6)", row).css("color","red");
-                $("td:eq(6)", row).html( "?" );
-            }
-            else
-            {
-                $("td:eq(6)", row).html( "-" );
+                $("td:eq(6)", row).html( "" );
             }
 
             // Check for existance of sixth column and display only if not Pi-holed
@@ -267,9 +260,8 @@ $(document).ready(function() {
             { "width" : "4%" },
             { "width" : "36%", "render": $.fn.dataTable.render.text() },
             { "width" : "8%", "render": $.fn.dataTable.render.text() },
-            { "width" : "10%", "orderData": 4 },
+            { "width" : "14%", "orderData": 4 },
             { "width" : "8%", "orderData": 6 },
-            { "width" : "4%", "orderData": 5 },
             { "width" : "10%", "orderData": 4 }
         ],
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],

From adfa0b6a03db7e78f2cfcf33d1c7dc7aeea0eb8c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 12:09:52 +0200
Subject: [PATCH 123/172] Remember last selected "Show X entries" in Query Log

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 26fee4e0..ebb848e3 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -273,6 +273,23 @@ $(document).ready(function() {
             { "width" : "10%", "orderData": 4 }
         ],
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
+        "stateSave": true,
+        stateSaveCallback: function(settings, data) {
+            // Store current state in client's local storage area
+            localStorage.setItem("query_log_table", JSON.stringify(data));
+        },
+        stateLoadCallback: function(settings) {
+            // Receive previous state from client's local storage area
+            var data = localStorage.getItem("query_log_table");
+            // Return if not available
+            if(data === null) return null;
+            // Ensure that we always start on the first page (most recent query)
+            data = JSON.parse(data);
+            data["start"] = 0;
+            console.log(data);
+            // Apply loaded state to table
+            return data;
+        },
         "columnDefs": [ {
             "targets": -1,
             "data": null,

From 965a8f31c73d1790f65681856c25d3df7dabc9ce Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 12:09:52 +0200
Subject: [PATCH 124/172] Remember last selected "Show X entries" in Query Log

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 26fee4e0..4d6d3772 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -273,6 +273,22 @@ $(document).ready(function() {
             { "width" : "10%", "orderData": 4 }
         ],
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
+        "stateSave": true,
+        stateSaveCallback: function(settings, data) {
+            // Store current state in client's local storage area
+            localStorage.setItem("query_log_table", JSON.stringify(data));
+        },
+        stateLoadCallback: function(settings) {
+            // Receive previous state from client's local storage area
+            var data = localStorage.getItem("query_log_table");
+            // Return if not available
+            if(data === null) return null;
+            // Ensure that we always start on the first page (most recent query)
+            data = JSON.parse(data);
+            data["start"] = 0;
+            // Apply loaded state to table
+            return data;
+        },
         "columnDefs": [ {
             "targets": -1,
             "data": null,

From 65cb428f3563f70390dd59d2dd6bd890fc278e30 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 12:24:15 +0200
Subject: [PATCH 125/172] Codacy forces { } even for single lines

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 4d6d3772..059e0a95 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -282,7 +282,7 @@ $(document).ready(function() {
             // Receive previous state from client's local storage area
             var data = localStorage.getItem("query_log_table");
             // Return if not available
-            if(data === null) return null;
+            if(data === null){ return null; }
             // Ensure that we always start on the first page (most recent query)
             data = JSON.parse(data);
             data["start"] = 0;

From c93fe7a93f8bec2a0928c23ca0b70c5a52423412 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 3 Jun 2018 12:29:28 +0200
Subject: [PATCH 126/172] Fix syntax

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index f5d7b46d..497bad12 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -146,51 +146,51 @@ $(document).ready(function() {
         "rowCallback": function( row, data, index ){
             var blocked = false;
 
-            $dnssec_status = "";
+            var dnssec_status = "";
             if (data[5] === "1")
             {
-                $dnssec_status = "<br><span style=\"color:green\">SECURE</span>";
+                dnssec_status = "<br><span style=\"color:green\">SECURE</span>";
             }
             else if (data[5] === "2")
             {
-                $dnssec_status = "<br><span style=\"color:orange\">INSECURE</span>";
+                dnssec_status = "<br><span style=\"color:orange\">INSECURE</span>";
             }
             else if (data[5] === "3")
             {
-                $dnssec_status = "<br><span style=\"color:red\">BOGUS</span>";
+                dnssec_status = "<br><span style=\"color:red\">BOGUS</span>";
             }
             else if (data[5] === "4")
             {
-                $dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
+                dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
             }
             else if (data[5] === "5")
             {
-                $dnssec_status = "<br><span style=\"color:red\">?</span>";
+                dnssec_status = "<br><span style=\"color:red\">?</span>";
             }
             if (data[4] === "1")
             {
                 blocked = true;
                 $(row).css("color","red");
-                $("td:eq(4)", row).html( "Pi-holed"+$dnssec_status );
+                $("td:eq(4)", row).html( "Pi-holed"+dnssec_status );
                 $("td:eq(6)", row).html( "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" );
             }
             else if (data[4] === "2")
             {
                 $(row).css("color","green");
-                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(forwarded)"+$dnssec_status );
+                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(forwarded)"+dnssec_status );
                 $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "3")
             {
                 $(row).css("color","green");
-                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(cached)"+$dnssec_status );
+                $("td:eq(4)", row).html( "OK <br class='hidden-lg'>(cached)"+dnssec_status );
                 $("td:eq(6)", row).html( "<button style=\"color:red; white-space: nowrap;\"><i class=\"fa fa-ban\"></i> Blacklist</button>" );
             }
             else if (data[4] === "4")
             {
                 blocked = true;
                 $(row).css("color","red");
-                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)"+$dnssec_status );
+                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)"+dnssec_status );
                 $("td:eq(6)", row).html( "" );
             }
             else if (data[4] === "5")

From 6f93f89e59a4a16478172623b8b1d5427c88a280 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 3 Jun 2018 16:13:59 -0400
Subject: [PATCH 127/172] Use new `client-names` FTL response format

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 api_FTL.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index d2966f34..f1d7a5a7 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -353,9 +353,7 @@ else
 		$client_names = array();
 		foreach($return as $line)
 		{
-			$tmp = explode(" ",$line);
-			// returned data is in format: "ID count hostname"
-			$client_names[intval($tmp[0])] = $tmp[2];
+			$client_names[] = $line;
 		}
 
 		$result = array('clients' => $client_names);

From 117aaa071f5f4db51a9718115deaac3bc2b39758 Mon Sep 17 00:00:00 2001
From: Mark Drobnak <newtoncat12@yahoo.com>
Date: Sun, 3 Jun 2018 23:11:21 -0400
Subject: [PATCH 128/172] Remove overTimeDataForwards

The FTL API has removed the underlying command and data.

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
---
 api_FTL.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index d2966f34..f677d55c 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -290,23 +290,6 @@ else
 		unset($data);
 	}
 
-	if (isset($_GET['overTimeDataForwards']) && $auth)
-	{
-		sendRequestFTL("ForwardedoverTime");
-		$return = getResponseFTL();
-		$over_time = array();
-
-		foreach($return as $line)
-		{
-			$tmp = explode(" ",$line);
-			for ($i=0; $i < count($tmp)-1; $i++) {
-				$over_time[intval($tmp[0])][$i] = floatval($tmp[$i+1]);
-			}
-		}
-		$result = array('over_time' => $over_time);
-		$data = array_merge($data, $result);
-	}
-
 	if (isset($_GET['getForwardDestinationNames']) && $auth)
 	{
 		sendRequestFTL("forward-names");

From a9a39e0073b068f4e6d0d585a1ba8e35acc9a7e5 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacob.salmela@pi-hole.net>
Date: Mon, 4 Jun 2018 20:37:02 -0500
Subject: [PATCH 129/172] add patreon and adjust affiliate links

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57412759..987b2bb6 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,11 @@ Sending a donation using our links below is **extremely helpful** in offsetting
 ### Alternative support
 If you'd rather not [donate](https://pi-hole.net/donate/) (_which is okay!_), there are other ways you can help support us:
 
+- [Patreon](https://patreon.com/pihole) _Become a patron for rewards_
 - [Digital Ocean](http://www.digitalocean.com/?refcode=344d234950e1) _affiliate link_
 - [UNIXstickers.com](http://unixstickers.refr.cc/jacobs) _save $5 when you spend $9 using our affiliate link_
 - [Pi-hole Swag Store](https://pi-hole.net/shop/) _affiliate link_
 - [Amazon](http://www.amazon.com/exec/obidos/redirect-home/pihole09-20) _affiliate link_
-- [Ho-ost](https://clients.ho-ost.com/aff.php?aff=19) _save 50% with our affiliate link_
 - [DNS Made Easy](https://cp.dnsmadeeasy.com/u/133706) _affiliate link_
 - [Vultr](http://www.vultr.com/?ref=7190426) _affiliate link_
 - Spreading the word about our software, and how you have benefited from it

From 36930e3834d1062a8971f3a6f8f756b810f94112 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 4 Jun 2018 23:35:41 +0100
Subject: [PATCH 130/172] Add regex support on the web interface

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 list.php                    |  9 ++----
 scripts/pi-hole/js/list.js  | 59 +++++++++++++++++++++++--------------
 scripts/pi-hole/php/get.php | 46 +++++++++++------------------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/list.php b/list.php
index 93bd0f56..d95c4e70 100644
--- a/list.php
+++ b/list.php
@@ -1,4 +1,4 @@
-<?php /* 
+<?php /*
 *    Pi-hole: A black hole for Internet advertisements
 *    (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 *    Network-wide ad blocking via your own hardware.
@@ -44,9 +44,6 @@ function getFullName() {
         <button id="btnRefresh" class="btn btn-default" type="button"><i class="fa fa-refresh"></i></button>
     </span>
 </div>
-<?php if($list === "white") { ?>
-    <p>Note: Whitelisting a subdomain of a wildcard blocked domain is not possible.</p>    
-<?php } ?>
 
 <!-- Alerts -->
 <div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden="true">
@@ -69,8 +66,8 @@ function getFullName() {
 <?php } ?>
 <ul class="list-group" id="list"></ul>
 <?php if($list === "black") { ?>
-<h3>Wildcard blocking</h3>
-<ul class="list-group" id="list-wildcard"></ul>
+<h3>Regex blocking</h3>
+<ul class="list-group" id="list-regex"></ul>
 <?php } ?>
 
 <?php
diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index e438f1b9..c34addd9 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -42,7 +42,7 @@ function refresh(fade) {
     var list = $("#list");
     if(listType === "black")
     {
-        listw = $("#list-wildcard");
+        listw = $("#list-regex");
     }
     if(fade) {
         list.fadeOut(100);
@@ -61,7 +61,7 @@ function refresh(fade) {
             {
                 listw.html("");
             }
-            var data = JSON.parse(response).sort();
+            var data = JSON.parse(response);
 
             if(data.length === 0) {
                 $("h3").hide();
@@ -74,37 +74,52 @@ function refresh(fade) {
                     list.html("<div class=\"alert alert-info\" role=\"alert\">Your " + fullName + " is empty!</div>");
                 }
             }
-            else {
+            else
+            {
                 $("h3").show();
-                data.forEach(function (entry, index) {
-                    if(entry.substr(0,1) === "*")
-                    {
-                        // Wildcard entry
-                        // remove leading *
-                        entry = entry.substr(1, entry.length - 1);
+                data[0] = data[0].sort();
+                data[0].forEach(function (entry, index) {
+                    // Whitelist entry or Blacklist (exact entry) are in the zero-th
+                    // array returned by get.php
+                    list.append(
+                    "<li id=\"" + index + "\" class=\"list-group-item clearfix\">" + entry +
+                    "<button class=\"btn btn-danger btn-xs pull-right\" type=\"button\">" +
+                    "<span class=\"glyphicon glyphicon-trash\"></span></button></li>");
+                    // Handle button
+                    $("#list #"+index+"").on("click", "button", function() {
+                        sub(index, entry, "exact");
+                    });
+                });
+
+                // Add regex domains if present in returned list data
+                if(data.length === 2)
+                {
+                    data[1] = data[1].sort();
+                    data[1].forEach(function (entry, index) {
+                        // Whitelist entry or Blacklist (exact entry) are in the zero-th
+                        // array returned by get.php
                         listw.append(
                         "<li id=\"" + index + "\" class=\"list-group-item clearfix\">" + entry +
                         "<button class=\"btn btn-danger btn-xs pull-right\" type=\"button\">" +
                         "<span class=\"glyphicon glyphicon-trash\"></span></button></li>");
                         // Handle button
-                        $("#list-wildcard #"+index+"").on("click", "button", function() {
+                        $("#list-regex #"+index+"").on("click", "button", function() {
                             sub(index, entry, "wild");
                         });
+                    });
+                }
+
+
+/*
+                        // Blacklist: exact + wildcard array
+                        entry = entry.substr(1, entry.length - 1);
+
+            if(data.length === 2)
+            {
                     }
                     else
                     {
-                        // Normal entry
-                        list.append(
-                        "<li id=\"" + index + "\" class=\"list-group-item clearfix\">" + entry +
-                        "<button class=\"btn btn-danger btn-xs pull-right\" type=\"button\">" +
-                        "<span class=\"glyphicon glyphicon-trash\"></span></button></li>");
-                        // Handle button
-                        $("#list #"+index+"").on("click", "button", function() {
-                            sub(index, entry, "exact");
-                        });
-                    }
-
-                });
+*/
             }
             list.fadeIn(100);
             if(listw)
diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
index a0aea17e..2e3e7a60 100644
--- a/scripts/pi-hole/php/get.php
+++ b/scripts/pi-hole/php/get.php
@@ -12,30 +12,35 @@ if(!isset($_GET['list']))
 
 $listtype = $_GET['list'];
 
+$basedir = "/etc/pihole/";
+
 require "func.php";
 
 switch ($listtype) {
-	case "white":
-		$list = getListContent("white");
-		break;
+    case "white":
+        $list = array(getListContent("whitelist.txt"));
+        break;
 
-	case "black":
-		$list = array_merge(getListContent("black"),getWildcardListContent());
-		break;
+    case "black":
+        $exact = array(getListContent("blacklist.txt"));
+        $regex = array(getListContent("regex.list"));
+        $list = array_merge($exact, $regex);
+        break;
 
-	default:
-		die("Invalid list parameter");
-		break;
+    default:
+        die("Invalid list parameter");
+        break;
 }
 
 
-function getListContent($type) {
-    $rawList = file_get_contents(checkfile("/etc/pihole/".$type."list.txt"));
+function getListContent($listname) {
+    global $basedir;
+    $rawList = file_get_contents(checkfile($basedir.$listname));
     $list = explode("\n", $rawList);
 
     // Get rid of empty lines
     for($i = sizeof($list)-1; $i >= 0; $i--) {
-        if($list[$i] == "")
+        if(strlen($list[$i]) < 1)
             unset($list[$i]);
     }
 
@@ -43,23 +48,6 @@ function getListContent($type) {
 
 }
 
-function getWildcardListContent() {
-    $rawList = file_get_contents(checkfile("/etc/dnsmasq.d/03-pihole-wildcard.conf"));
-    $wclist = explode("\n", $rawList);
-    $list = [];
-
-    foreach ($wclist as $entry) {
-        $expl = explode("/", $entry);
-        if(count($expl) == 3)
-        {
-            array_push($list,"*${expl[1]}");
-        }
-    }
-
-    return array_unique($list);
-
-}
-
 function filterArray(&$inArray) {
     $outArray = array();
     foreach ($inArray as $key=>$value) {

From d901dc29b3551b831771ab2b3deb848e7a98d59d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 6 Jun 2018 19:26:25 +0200
Subject: [PATCH 131/172] Fix button label

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/list.php b/list.php
index d95c4e70..21c8547b 100644
--- a/list.php
+++ b/list.php
@@ -37,7 +37,7 @@ function getFullName() {
     <span class="input-group-btn">
     <?php if($list === "black") { ?>
         <button id="btnAdd" class="btn btn-default" type="button">Add (exact)</button>
-        <button id="btnAddWildcard" class="btn btn-default" type="button">Add (wildcard)</button>
+        <button id="btnAddWildcard" class="btn btn-default" type="button">Add (regex)</button>
     <?php }else{ ?>
         <button id="btnAdd" class="btn btn-default" type="button">Add</button>
     <?php } ?>

From 357da1d15af7044e9658652c470d68391bd460fa Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Wed, 6 Jun 2018 18:27:55 -0400
Subject: [PATCH 132/172] Expose both name and IP of client

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 api_FTL.php                 | 6 +++++-
 scripts/pi-hole/js/index.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index f1d7a5a7..3cf3f5f4 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -353,7 +353,11 @@ else
 		$client_names = array();
 		foreach($return as $line)
 		{
-			$client_names[] = $line;
+			$tmp = explode(" ", $line);
+			$client_names[] = array(
+				"name" => $tmp[0],
+				"ip" => $tmp[1]
+			);
 		}
 
 		$result = array('clients' => $client_names);
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 0ace02af..e91369eb 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -386,7 +386,7 @@ function updateClientsOverTime() {
         for (key in data.clients)
         {
             if (!{}.hasOwnProperty.call(data.clients, key)) continue;
-            labels.push(data.clients[key]);
+            labels.push(data.clients[key].name);
         }
         // Get colors from AdminLTE
         var colors = [];

From 2aef23504091eda7b68201139db43fc84e7131c7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 7 Jun 2018 19:03:39 +0200
Subject: [PATCH 133/172] Use client address if name is empty

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/index.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index e91369eb..c765b33f 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -386,7 +386,16 @@ function updateClientsOverTime() {
         for (key in data.clients)
         {
             if (!{}.hasOwnProperty.call(data.clients, key)) continue;
-            labels.push(data.clients[key].name);
+            var clientname;
+            if(data.clients[key].name.length > 0)
+            {
+                clientname = data.clients[key].name;
+            }
+            else
+            {
+                clientname = data.clients[key].ip;
+            }
+            labels.push(clientname);
         }
         // Get colors from AdminLTE
         var colors = [];

From f35f663be9cfdcc4fd5757e2ad61d13122ad5d10 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 7 Jun 2018 20:20:16 +0200
Subject: [PATCH 134/172] Add api.php?updatecheck endpoint

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/api.php b/api.php
index 16964a04..ade11750 100644
--- a/api.php
+++ b/api.php
@@ -73,6 +73,18 @@ elseif (isset($_GET['disable']) && $auth)
 	}
 	$data = array_merge($data, array("status" => "disabled"));
 }
+elseif (isset($_GET['updatecheck']))
+{
+	// Determine if updates are available for Pi-hole
+	// using the same script that we use for the footer
+	// on the dashboard (update notifications are
+	// suppressed if on development branches)
+	require "scripts/pi-hole/php/update_checker.php";
+	$updates = array("core_update" => $core_update,
+	                 "web_update" => $web_update,
+	                 "FTL_update" => $FTL_update);
+	$data = array_merge($data, $updates);
+}
 
 // Other API functions
 require("api_FTL.php");

From 7f8d8fe7e25834f1a96fa18ab1378cd21f8931ee Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 7 Jun 2018 20:21:12 +0200
Subject: [PATCH 135/172] Rename the new endpoint to "api.php?versions" and
 include also current and latest versions + current branches

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/api.php b/api.php
index ade11750..f4221f30 100644
--- a/api.php
+++ b/api.php
@@ -73,7 +73,7 @@ elseif (isset($_GET['disable']) && $auth)
 	}
 	$data = array_merge($data, array("status" => "disabled"));
 }
-elseif (isset($_GET['updatecheck']))
+elseif (isset($_GET['versions']))
 {
 	// Determine if updates are available for Pi-hole
 	// using the same script that we use for the footer
@@ -83,7 +83,19 @@ elseif (isset($_GET['updatecheck']))
 	$updates = array("core_update" => $core_update,
 	                 "web_update" => $web_update,
 	                 "FTL_update" => $FTL_update);
+	$current = array("core_current" => $core_current,
+	                 "web_current" => $web_current,
+	                 "FTL_current" => $FTL_current);
+	$latest = array("core_latest" => $core_latest,
+	                "web_latest" => $web_latest,
+	                "FTL_latest" => $FTL_latest);
+	$branches = array("core_branch" => $core_branch,
+	                  "web_branch" => $web_branch,
+	                  "FTL_branch" => $FTL_branch);
 	$data = array_merge($data, $updates);
+	$data = array_merge($data, $current);
+	$data = array_merge($data, $latest);
+	$data = array_merge($data, $branches);
 }
 
 // Other API functions

From 14a409507912c029d44dcbc269c86986dc1fde1c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 7 Jun 2018 20:44:47 +0200
Subject: [PATCH 136/172] Refine shown message

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 8715e016..0b971fd2 100644
--- a/settings.php
+++ b/settings.php
@@ -23,7 +23,7 @@ else
 $last_error = error_get_last();
 if($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR)
 {
-	$error .= "PHP error (".htmlspecialchars($last_error["type"])."): ".htmlspecialchars($last_error["message"])." in ".htmlspecialchars($last_error["file"]).":".htmlspecialchars($last_error["line"]);
+	$error .= "There was a problem applying your settings.<br>Debugging information:<br>PHP error (".htmlspecialchars($last_error["type"])."): ".htmlspecialchars($last_error["message"])." in ".htmlspecialchars($last_error["file"]).":".htmlspecialchars($last_error["line"]);
 }
 
 ?>

From 881d80b7f7ccec8df702d5c6fdec8423b4ef8dc0 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 14 Jun 2018 17:25:22 +0200
Subject: [PATCH 137/172] Don't append DNSSEC status if wildcard blocked

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 497bad12..273b5ce4 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -190,7 +190,7 @@ $(document).ready(function() {
             {
                 blocked = true;
                 $(row).css("color","red");
-                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)"+dnssec_status );
+                $("td:eq(4)", row).html( "Pi-holed <br class='hidden-lg'>(wildcard)");
                 $("td:eq(6)", row).html( "" );
             }
             else if (data[4] === "5")

From a0f9a1bdb8ee3c3331b16c1312bd86a1651e8637 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 17 Jun 2018 15:11:11 +0200
Subject: [PATCH 138/172] JavaScript allows the omission of curly braces when a
 block contains only one statement. However, codacy wants us to never omit
 curly braces around blocks, even when they are optional. This code has not
 been introduced in this PR, so it's not entirely clear why it has been
 detected in this PR...

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 38d52300..3ea38cff 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -274,7 +274,7 @@ $(document).ready(function() {
             // Receive previous state from client's local storage area
             var data = localStorage.getItem("query_log_table");
             // Return if not available
-            if(data === null) return null;
+            if(data === null){ return null; }
             // Ensure that we always start on the first page (most recent query)
             data = JSON.parse(data);
             data["start"] = 0;

From 3f7246968e2ddb8fdd69b7a487d2ada3f366c083 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 17 Jun 2018 20:01:46 +0200
Subject: [PATCH 139/172] Review comments

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/list.js  | 12 ------------
 scripts/pi-hole/php/get.php |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index c34addd9..1e6bf093 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -108,18 +108,6 @@ function refresh(fade) {
                         });
                     });
                 }
-
-
-/*
-                        // Blacklist: exact + wildcard array
-                        entry = entry.substr(1, entry.length - 1);
-
-            if(data.length === 2)
-            {
-                    }
-                    else
-                    {
-*/
             }
             list.fadeIn(100);
             if(listw)
diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
index 2e3e7a60..e2a67a94 100644
--- a/scripts/pi-hole/php/get.php
+++ b/scripts/pi-hole/php/get.php
@@ -22,9 +22,9 @@ switch ($listtype) {
         break;
 
     case "black":
-        $exact = array(getListContent("blacklist.txt"));
-        $regex = array(getListContent("regex.list"));
-        $list = array_merge($exact, $regex);
+        $exact = getListContent("blacklist.txt");
+        $regex = getListContent("regex.list");
+        $list = array($exact, $regex);
         break;
 
     default:

From 19355441830c743a48aae80183ebde6e153d0246 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 23 Jun 2018 15:50:19 +0200
Subject: [PATCH 140/172] Directly manipulate regex.list from PHP to avoid
 detour over bash. This needs read/write permissions of the PHP user on
 "/etc/pihole/regex.list" !

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/list.js   |  3 ++-
 scripts/pi-hole/php/add.php  |  8 +++-----
 scripts/pi-hole/php/auth.php | 11 ++++++++++-
 scripts/pi-hole/php/get.php  |  5 ++++-
 scripts/pi-hole/php/sub.php  | 19 ++++++++++++++++++-
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index 1e6bf093..da8a19c8 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -146,7 +146,8 @@ function add(arg) {
         method: "post",
         data: {"domain":domain.val().trim(), "list":locallistType, "token":token},
         success: function(response) {
-          if (response.indexOf("] Pi-hole blocking is ") === -1) {
+          if (locallistType !== "wild" && response.indexOf("] Pi-hole blocking is ") === -1 ||
+              locallistType === "wild" && response.length > 1) {
             alFailure.show();
             err.html(response);
             alFailure.delay(4000).fadeOut(2000, function() {
diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index a19aae7a..6ec0568a 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -34,12 +34,10 @@ switch($type) {
         }
         break;
     case "wild":
-        if(!isset($_POST["auditlog"]))
-            echo exec("sudo pihole -wild -q ${_POST['domain']}");
-        else
+        if(file_put_contents($regexfile, $_POST['domain']."\n", FILE_APPEND) === FALSE)
         {
-            echo exec("sudo pihole -wild -q -n ${_POST['domain']}");
-            echo exec("sudo pihole -a audit ${_POST['domain']}");
+            $err = error_get_last()["message"];
+            echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
         }
     case "audit":
         echo exec("sudo pihole -a audit ${_POST['domain']}");
diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
index 0b32c732..d540db4a 100644
--- a/scripts/pi-hole/php/auth.php
+++ b/scripts/pi-hole/php/auth.php
@@ -11,6 +11,7 @@ $ERRORLOG = getenv('PHP_ERROR_LOG');
 if (empty($ERRORLOG)) {
     $ERRORLOG = '/var/log/lighttpd/error.log';
 }
+$regexfile = "/etc/pihole/regex.list";
 
 function pi_log($message) {
     error_log(date('Y-m-d H:i:s') . ': ' . $message . "\n", 3, $GLOBALS['ERRORLOG']);
@@ -133,6 +134,14 @@ function list_verify($type) {
     {
         log_and_die("Not allowed!");
     }
-    check_domain();
+
+    // Don't check if the added item is a
+    // valid domain for regex expressions
+    // Regex filters are validated by FTL
+    // on import and skipped if invalid
+    if($_POST['list'] !== "wild")
+    {
+        check_domain();
+    }
 }
 ?>
diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
index e2a67a94..a05b4eea 100644
--- a/scripts/pi-hole/php/get.php
+++ b/scripts/pi-hole/php/get.php
@@ -44,7 +44,10 @@ function getListContent($listname) {
             unset($list[$i]);
     }
 
-    return $list;
+    // Re-index list after possible unset() activity
+    $newlist = array_values($list);
+
+    return $newlist;
 
 }
 
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index bab6e51f..8167e493 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -22,7 +22,24 @@ switch($type) {
         exec("sudo pihole -b -q -d ${_POST['domain']}");
         break;
     case "wild":
-        exec("sudo pihole -wild -q -d ${_POST['domain']}");
+        if(($list = file_get_contents($regexfile)) === FALSE)
+        {
+            $err = error_get_last()["message"];
+            echo "Unable to read ${regexfile}<br>Error message: $err";
+        }
+
+        // Replace regex with empty line ...
+        $list = str_replace($_POST['domain'], '', $list);
+        // ... and remove all empty lines from the file
+        $tmp = explode("\n", $list);
+        $tmp = array_filter($tmp);
+        $list = implode("\n", $tmp);
+
+        if(file_put_contents($regexfile, $list) === FALSE)
+        {
+            $err = error_get_last()["message"];
+            echo "Unable to remove regex \"".htmlspecialchars($_POST['domain'])."\" from ${regexfile}<br>Error message: $err";
+        }
         break;
 }
 

From c0da231fa63b64c377c01c93b08ee20c3278d6f6 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 24 Jun 2018 12:42:05 +0200
Subject: [PATCH 141/172] Force reload of the regex filters in FTLDNS after
 having added/removed one from the dashboard

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/add.php | 7 +++++++
 scripts/pi-hole/php/sub.php | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 6ec0568a..952e38fb 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -39,6 +39,13 @@ switch($type) {
             $err = error_get_last()["message"];
             echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
         }
+        else
+        {
+            // Send SIGHUP to pihole-FTL using a frontend command
+            // to force reloading of the regex domains
+            // This will also wipe the resolver's cache
+            echo exec("sudo pihole restartdns reload");
+        }
     case "audit":
         echo exec("sudo pihole -a audit ${_POST['domain']}");
         break;
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index 8167e493..ef2bb60d 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -40,6 +40,13 @@ switch($type) {
             $err = error_get_last()["message"];
             echo "Unable to remove regex \"".htmlspecialchars($_POST['domain'])."\" from ${regexfile}<br>Error message: $err";
         }
+        else
+        {
+            // Send SIGHUP to pihole-FTL using a frontend command
+            // to force reloading of the regex domains
+            // This will also wipe the resolver's cache
+            echo exec("sudo pihole restartdns reload");
+        }
         break;
 }
 

From 9bc09564ba2b1743c4815a2028aba7c363e92e48 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Mon, 25 Jun 2018 19:44:22 -0400
Subject: [PATCH 142/172] Improve readability of long term summary stats

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/js/db_queries.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index 751081d4..916fc9e0 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -161,16 +161,16 @@ var reloadCallback = function()
             statistics[3]++;
         }
     }
-    $("h3#dns_queries").text(statistics[0]);
-    $("h3#ads_blocked_exact").text(statistics[2]);
-    $("h3#ads_wildcard_blocked").text(statistics[3]);
+    $("h3#dns_queries").text(statistics[0].toLocaleString());
+    $("h3#ads_blocked_exact").text(statistics[2].toLocaleString());
+    $("h3#ads_wildcard_blocked").text(statistics[3].toLocaleString());
 
     var percent = 0.0;
     if(statistics[2] + statistics[3] > 0)
     {
         percent = 100.0*(statistics[2] + statistics[3]) / statistics[0];
     }
-    $("h3#ads_percentage_today").text(parseFloat(percent).toFixed(1)+" %");
+    $("h3#ads_percentage_today").text(parseFloat(percent).toFixed(1).toLocaleString()+" %");
 };
 
 function refreshTableData() {

From aef5f7c7cee1ce443273c68da527c9957e13943a Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Thu, 28 Jun 2018 23:16:11 -0400
Subject: [PATCH 143/172] Keep trailing newline in regex file after removal

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/sub.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index ef2bb60d..445f95f3 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -34,6 +34,8 @@ switch($type) {
         $tmp = explode("\n", $list);
         $tmp = array_filter($tmp);
         $list = implode("\n", $tmp);
+        // ... and add a newline to the end
+        $list .= "\n";
 
         if(file_put_contents($regexfile, $list) === FALSE)
         {

From 4259aada7802f1b1b19f28422ed9b46773679572 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 29 Jun 2018 23:03:01 -0400
Subject: [PATCH 144/172] Don't leave a newline at the end of the regex file

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/add.php | 2 +-
 scripts/pi-hole/php/sub.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 952e38fb..723eef11 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -34,7 +34,7 @@ switch($type) {
         }
         break;
     case "wild":
-        if(file_put_contents($regexfile, $_POST['domain']."\n", FILE_APPEND) === FALSE)
+        if(file_put_contents($regexfile, "\n".$_POST['domain'], FILE_APPEND) === FALSE)
         {
             $err = error_get_last()["message"];
             echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index 445f95f3..ef2bb60d 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -34,8 +34,6 @@ switch($type) {
         $tmp = explode("\n", $list);
         $tmp = array_filter($tmp);
         $list = implode("\n", $tmp);
-        // ... and add a newline to the end
-        $list .= "\n";
 
         if(file_put_contents($regexfile, $list) === FALSE)
         {

From f1ea117eda914ae84d34f42d49b7123676d9f285 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 29 Jun 2018 23:49:10 -0400
Subject: [PATCH 145/172] Update help page for regex

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help.php b/help.php
index c3a1f875..63eb93be 100644
--- a/help.php
+++ b/help.php
@@ -70,7 +70,7 @@
     <div class="col-md-12">
     <h2>White- / Blacklist</h2>
     <p>Add or remove domains (or subdomains) from the white-/blacklist. If a domain is added to e.g. the whitelist, any possible entry of the same domain will be automatically removed from the blacklist and vice versa.</p>
-    <p>Wildcard blacklisting is supported (entering <samp>something.de</samp> will block this domain including all subdomains like <samp>a.bb.c.999.something.de</samp>). Note that wildcard whitelisting is <em>not</em> supported.</p>
+    <p>Regex blacklisting is supported (entering <samp>^example.*$</samp> will block any domain starting with <samp>example</samp>). You can still whitelist specific domains even if the fall under a regex pattern.</p>
     <p>You can white-/blacklist multiple entries at a time if you separate the domains by spaces.</p>
     </div>
 </div>

From ec0afceeed9cc44a41b242b19ebbfc5afb7106f1 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 30 Jun 2018 14:19:03 +0200
Subject: [PATCH 146/172] Add new button to allow both regex filters and legacy
 wildcards (get automatically converted to regex format)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 list.php                     |  5 +++--
 scripts/pi-hole/js/list.js   | 14 ++++++++++----
 scripts/pi-hole/php/add.php  | 35 +++++++++++++++++++++++------------
 scripts/pi-hole/php/auth.php |  2 +-
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/list.php b/list.php
index 21c8547b..5e4b9751 100644
--- a/list.php
+++ b/list.php
@@ -37,7 +37,8 @@ function getFullName() {
     <span class="input-group-btn">
     <?php if($list === "black") { ?>
         <button id="btnAdd" class="btn btn-default" type="button">Add (exact)</button>
-        <button id="btnAddWildcard" class="btn btn-default" type="button">Add (regex)</button>
+        <button id="btnAddWildcard" class="btn btn-default" type="button">Add (wildcard)</button>
+        <button id="btnAddRegex" class="btn btn-default" type="button">Add (regex)</button>
     <?php }else{ ?>
         <button id="btnAdd" class="btn btn-default" type="button">Add</button>
     <?php } ?>
@@ -66,7 +67,7 @@ function getFullName() {
 <?php } ?>
 <ul class="list-group" id="list"></ul>
 <?php if($list === "black") { ?>
-<h3>Regex blocking</h3>
+<h3>Regex &amp; Wildcard blocking</h3>
 <ul class="list-group" id="list-regex"></ul>
 <?php } ?>
 
diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index da8a19c8..99e7be05 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -126,12 +126,14 @@ window.onload = refresh(false);
 function add(arg) {
     var locallistType = listType;
     var domain = $("#domain");
+    var wild = false;
     if(domain.val().length === 0){
         return;
     }
-    if(arg === "wild")
+    if(arg === "wild" || arg === "regex")
     {
-        locallistType = "wild";
+        locallistType = arg;
+        wild = true;
     }
 
     var alInfo = $("#alInfo");
@@ -146,8 +148,8 @@ function add(arg) {
         method: "post",
         data: {"domain":domain.val().trim(), "list":locallistType, "token":token},
         success: function(response) {
-          if (locallistType !== "wild" && response.indexOf("] Pi-hole blocking is ") === -1 ||
-              locallistType === "wild" && response.length > 1) {
+          if (!wild && response.indexOf("] Pi-hole blocking is ") === -1 ||
+               wild && response.length > 1) {
             alFailure.show();
             err.html(response);
             alFailure.delay(4000).fadeOut(2000, function() {
@@ -200,6 +202,10 @@ $("#btnAddWildcard").on("click", function() {
     add("wild");
 });
 
+$("#btnAddRegex").on("click", function() {
+    add("regex");
+});
+
 $("#btnRefresh").on("click", function() {
     refresh(true);
 });
diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 723eef11..fe4668cb 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -14,6 +14,23 @@ $type = $_POST['list'];
 // All of the verification for list editing
 list_verify($type);
 
+function add_regex($regex)
+{
+    global $regexfile;
+    if(file_put_contents($regexfile, "\n".$regex, FILE_APPEND) === FALSE)
+    {
+        $err = error_get_last()["message"];
+        echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
+    }
+    else
+    {
+        // Send SIGHUP to pihole-FTL using a frontend command
+        // to force reloading of the regex domains
+        // This will also wipe the resolver's cache
+        echo exec("sudo pihole restartdns reload");
+    }
+}
+
 switch($type) {
     case "white":
         if(!isset($_POST["auditlog"]))
@@ -34,18 +51,12 @@ switch($type) {
         }
         break;
     case "wild":
-        if(file_put_contents($regexfile, "\n".$_POST['domain'], FILE_APPEND) === FALSE)
-        {
-            $err = error_get_last()["message"];
-            echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
-        }
-        else
-        {
-            // Send SIGHUP to pihole-FTL using a frontend command
-            // to force reloading of the regex domains
-            // This will also wipe the resolver's cache
-            echo exec("sudo pihole restartdns reload");
-        }
+        // Escape "." so it won't be interpreted as the wildcard character
+        $domain = str_replace(".","\.",$_POST['domain']);
+        // Add regex filter for legacy wildcard behavior
+        add_regex("((^)|(\.))".$domain."$");
+    case "regex":
+        add_regex($_POST['domain']);
     case "audit":
         echo exec("sudo pihole -a audit ${_POST['domain']}");
         break;
diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
index d540db4a..027220c9 100644
--- a/scripts/pi-hole/php/auth.php
+++ b/scripts/pi-hole/php/auth.php
@@ -139,7 +139,7 @@ function list_verify($type) {
     // valid domain for regex expressions
     // Regex filters are validated by FTL
     // on import and skipped if invalid
-    if($_POST['list'] !== "wild")
+    if($_POST['list'] !== "regex")
     {
         check_domain();
     }

From 4566db2a7ce8291637b92085bdf0480175b26df7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 30 Jun 2018 14:30:45 +0200
Subject: [PATCH 147/172] Use passed argument in new function add_regex()

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index fe4668cb..99f8a55d 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -20,7 +20,7 @@ function add_regex($regex)
     if(file_put_contents($regexfile, "\n".$regex, FILE_APPEND) === FALSE)
     {
         $err = error_get_last()["message"];
-        echo "Unable to add regex \"".htmlspecialchars($_POST['domain'])."\" to ${regexfile}<br>Error message: $err";
+        echo "Unable to add regex \"".htmlspecialchars($regex)."\" to ${regexfile}<br>Error message: $err";
     }
     else
     {

From e8b2cbe69863373e212ab434852024eec9f6c8f8 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 30 Jun 2018 14:42:52 +0200
Subject: [PATCH 148/172] Tag regex filters as "regex" to avoid the domain
 validation (otherwise regex lines could not get removed). Also ensure that
 deleting the first wildcard/regex does not hide the first exact blocking
 domain (this bug has been in since the very beginning of wildcard blocking)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/list.js  | 11 ++++++-----
 scripts/pi-hole/php/sub.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index 99e7be05..1ac0e294 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -13,13 +13,14 @@ var listType = $("#list-type").html();
 var fullName = listType === "white" ? "Whitelist" : "Blacklist";
 
 function sub(index, entry, arg) {
-    var domain = $("#"+index);
+    var domain = $("#list #"+index);
     var locallistType = listType;
-    domain.hide("highlight");
-    if(arg === "wild")
+    if(arg === "regex")
     {
-        locallistType = "wild";
+        locallistType = "regex";
+        domain = $("#list-regex #"+index);
     }
+    domain.hide("highlight");
     $.ajax({
         url: "scripts/pi-hole/php/sub.php",
         method: "post",
@@ -104,7 +105,7 @@ function refresh(fade) {
                         "<span class=\"glyphicon glyphicon-trash\"></span></button></li>");
                         // Handle button
                         $("#list-regex #"+index+"").on("click", "button", function() {
-                            sub(index, entry, "wild");
+                            sub(index, entry, "regex");
                         });
                     });
                 }
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index ef2bb60d..d06d6537 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -21,7 +21,7 @@ switch($type) {
     case "black":
         exec("sudo pihole -b -q -d ${_POST['domain']}");
         break;
-    case "wild":
+    case "regex":
         if(($list = file_get_contents($regexfile)) === FALSE)
         {
             $err = error_get_last()["message"];

From dc5ab22ff5d1d0ba8078a5a348059e7aa40a376f Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 30 Jun 2018 14:54:10 +0200
Subject: [PATCH 149/172] Show link to Pi-hole's Regex documentation

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/list.php b/list.php
index 5e4b9751..ff06b01f 100644
--- a/list.php
+++ b/list.php
@@ -67,7 +67,7 @@ function getFullName() {
 <?php } ?>
 <ul class="list-group" id="list"></ul>
 <?php if($list === "black") { ?>
-<h3>Regex &amp; Wildcard blocking</h3>
+<h3><a href="https://docs.pi-hole.net/ftldns/regex/" target="_blank" title="Click for Pi-hole Regex documentation">Regex</a> &amp; Wildcard blocking</h3>
 <ul class="list-group" id="list-regex"></ul>
 <?php } ?>
 

From 2759ec0da52525fbb98e74bbea2c4a8d43be6475 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sat, 30 Jun 2018 15:18:13 -0400
Subject: [PATCH 150/172] Add missing break statements

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/add.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 99f8a55d..2d3601f8 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -55,8 +55,10 @@ switch($type) {
         $domain = str_replace(".","\.",$_POST['domain']);
         // Add regex filter for legacy wildcard behavior
         add_regex("((^)|(\.))".$domain."$");
+        break;
     case "regex":
         add_regex($_POST['domain']);
+        break;
     case "audit":
         echo exec("sudo pihole -a audit ${_POST['domain']}");
         break;

From 7c742a426f1f0d4d052596facc24faf9c1370777 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 1 Jul 2018 12:58:46 +0200
Subject: [PATCH 151/172] Help: No need for a trailing ".*$" as this will match
 anything (so we can also just leave it off)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help.php b/help.php
index 63eb93be..20184247 100644
--- a/help.php
+++ b/help.php
@@ -70,7 +70,7 @@
     <div class="col-md-12">
     <h2>White- / Blacklist</h2>
     <p>Add or remove domains (or subdomains) from the white-/blacklist. If a domain is added to e.g. the whitelist, any possible entry of the same domain will be automatically removed from the blacklist and vice versa.</p>
-    <p>Regex blacklisting is supported (entering <samp>^example.*$</samp> will block any domain starting with <samp>example</samp>). You can still whitelist specific domains even if the fall under a regex pattern.</p>
+    <p>Regex blacklisting is supported (entering <samp>^example/samp> will block any domain starting with <samp>example</samp>, see also our <a href="https://docs.pi-hole.net/ftldns/regex/" target="_blank">Regex documentation</a>). You can still whitelist specific domains even if the fall under a regex pattern.</p>
     <p>You can white-/blacklist multiple entries at a time if you separate the domains by spaces.</p>
     </div>
 </div>

From 342a53ed99898e3aa73437ff511c45ea21ce2585 Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Sun, 1 Jul 2018 13:10:38 +0100
Subject: [PATCH 152/172] Remove duplicate of the word "queries" on the query
 log page

Signed-off-by: Adam Warner <adamw@rner.email>
---
 queries.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries.php b/queries.php
index 09819465..8e7133d0 100644
--- a/queries.php
+++ b/queries.php
@@ -38,7 +38,7 @@ else
 {
 	// If filter variable is not set, we
 	// automatically show all queries
-	$showing = "showing queries";
+	$showing = "showing";
 }
 
 $showall = false;

From c837894bb5b5a6b933b76f1d5b92b66b1964f5b1 Mon Sep 17 00:00:00 2001
From: Mark Drobnak <newtoncat12@yahoo.com>
Date: Sun, 1 Jul 2018 12:02:43 -0400
Subject: [PATCH 153/172] Add back missing < and fix typo

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
---
 help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help.php b/help.php
index 20184247..c4c932d1 100644
--- a/help.php
+++ b/help.php
@@ -70,7 +70,7 @@
     <div class="col-md-12">
     <h2>White- / Blacklist</h2>
     <p>Add or remove domains (or subdomains) from the white-/blacklist. If a domain is added to e.g. the whitelist, any possible entry of the same domain will be automatically removed from the blacklist and vice versa.</p>
-    <p>Regex blacklisting is supported (entering <samp>^example/samp> will block any domain starting with <samp>example</samp>, see also our <a href="https://docs.pi-hole.net/ftldns/regex/" target="_blank">Regex documentation</a>). You can still whitelist specific domains even if the fall under a regex pattern.</p>
+    <p>Regex blacklisting is supported (entering <samp>^example</samp> will block any domain starting with <samp>example</samp>, see also our <a href="https://docs.pi-hole.net/ftldns/regex/" target="_blank">Regex documentation</a>). You can still whitelist specific domains even if they fall under a regex pattern.</p>
     <p>You can white-/blacklist multiple entries at a time if you separate the domains by spaces.</p>
     </div>
 </div>

From 25c4a0e31421838e2b9149771e1f73878236c34c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 4 Jul 2018 22:57:41 +0200
Subject: [PATCH 154/172] Print a glowing warning when the user defines a
 privacy level > 0 but still has logging enabled (he can still do this, but we
 should tell them that the pihole.log file will still contain the full
 records)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 settings.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/settings.php b/settings.php
index 0b971fd2..902192e9 100644
--- a/settings.php
+++ b/settings.php
@@ -1036,6 +1036,9 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                     </div>
                                                 </div>
                                                 <p>The privacy level may be changed at any time without having to restart the DNS resolver. However, note that queries with (partially) hidden details cannot be disclosed with a subsequent reduction of the privacy level.</p>
+                                                <?php if($privacylevel > 0 && $piHoleLogging){ ?>
+                                                <p class="lookatme">Warning: Pi-hole's query logging is activated. Although the dashboard will hide the requested details, all queries are still fully logged to the pihole.log file.</p>
+                                                <?php } ?>
                                             </div>
                                         </div>
                                     </div>

From fbe9516cbeaae7eb1f8f92ab423fc56637b87e60 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 8 Jul 2018 16:27:38 -0400
Subject: [PATCH 155/172] Fix incorrect regex removal code

If you had these in the regex list:
- example\.com
- example
- ^example.*

And you removed "example", then the list would look like this:
- \.com
- ^.*

This behavior is fixed.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/sub.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index d06d6537..cb5803de 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -28,12 +28,10 @@ switch($type) {
             echo "Unable to read ${regexfile}<br>Error message: $err";
         }
 
-        // Replace regex with empty line ...
-        $list = str_replace($_POST['domain'], '', $list);
-        // ... and remove all empty lines from the file
-        $tmp = explode("\n", $list);
-        $tmp = array_filter($tmp);
-        $list = implode("\n", $tmp);
+        // Remove the regex and any empty lines from the list
+        $list = explode("\n", $list);
+        $list = array_diff($list, array($_POST['domain'], ""));
+        $list = implode("\n", $list);
 
         if(file_put_contents($regexfile, $list) === FALSE)
         {

From 6dc8bf300cabd203f29ab104ad8f4669deed2a86 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 14 Jul 2018 15:27:54 +0200
Subject: [PATCH 156/172] Export regex.list

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 9efe7fd1..66c5db5e 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -66,27 +66,6 @@ function check_domains($domains)
 	}
 }
 
-function getWildcardListContent() {
-	if(file_exists("/etc/dnsmasq.d/03-pihole-wildcard.conf"))
-	{
-		$rawList = file_get_contents("/etc/dnsmasq.d/03-pihole-wildcard.conf");
-		$wclist = explode("\n", $rawList);
-		$list = [];
-
-		foreach ($wclist as $entry) {
-			$expl = explode("/", $entry);
-			if(count($expl) == 3)
-			{
-				array_push($list,$expl[1]);
-			}
-		}
-
-		return implode("\n",array_unique($list));
-	}
-
-	return "";
-}
-
 if(isset($_POST["action"]))
 {
 	if($_FILES["zip_file"]["name"] && $_POST["action"] == "in")
@@ -177,9 +156,9 @@ else
 	archive_add_file("/etc/pihole/","adlists.list");
 	archive_add_file("/etc/pihole/","setupVars.conf");
 	archive_add_file("/etc/pihole/","auditlog.list");
+	archive_add_file("/etc/pihole/","regex.list");
 	archive_add_directory("/etc/dnsmasq.d/");
 
-	$archive["wildcardblocking.txt"] = getWildcardListContent();
 	$archive->compress(Phar::GZ); // Creates a gziped copy
 	unlink($archive_file_name); // Unlink original tar file as it is not needed anymore
 	$archive_file_name .= ".gz"; // Append ".gz" extension to ".tar"

From 50885d092ab239ded1d07bd2ce0b56f09a6c29ff Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 14 Jul 2018 15:33:52 +0200
Subject: [PATCH 157/172] Import regex.list if requested. Don't check validity
 of regex filters as they are not necessarily in valid domain format

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 20 ++++++++++++--------
 settings.php                       |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 66c5db5e..8f0a46e3 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -43,7 +43,7 @@ function limit_length(&$item, $key)
 	$item = substr($item, 0, 253);
 }
 
-function process_file($contents)
+function process_file($contents,$check=True)
 {
 	$domains = array_filter(explode("\n",$contents));
 
@@ -51,8 +51,12 @@ function process_file($contents)
 	// function to every member of the array of domains
 	array_walk($domains, "limit_length");
 
-	// Check validity of domains (after possible clipping)
-	check_domains($domains);
+	// Check validity of domains (don't do it for regex filters)
+	if($check)
+	{
+		check_domains($domains);
+	}
+
 	return $domains;
 }
 
@@ -118,12 +122,12 @@ if(isset($_POST["action"]))
 				$importedsomething = true;
 			}
 
-			if(isset($_POST["wildlist"]) && $file->getFilename() === "wildcardblocking.txt")
+			if(isset($_POST["regexlist"]) && $file->getFilename() === "regex.list")
 			{
-				$wildlist = process_file(file_get_contents($file));
-				echo "Processing wildcardblocking.txt<br>\n";
-				exec("sudo pihole -wild -nr --nuke");
-				exec("sudo pihole -wild -q -nr ".implode(" ", $wildlist));
+				$regexlist = process_file(file_get_contents($file),false);
+				echo "Processing regex.list<br>\n";
+				exec("sudo pihole --regex -nr --nuke");
+				exec("sudo pihole --regex -q -nr ".implode(" ", $regexlist));
 				$importedsomething = true;
 			}
 			if($importedsomething)
diff --git a/settings.php b/settings.php
index 902192e9..f824dcf2 100644
--- a/settings.php
+++ b/settings.php
@@ -1096,9 +1096,9 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                             Blacklist (exact)</label>
                                                     </div>
                                                     <div class="checkbox">
-                                                        <label><input type="checkbox" name="wildlist" value="true"
+                                                        <label><input type="checkbox" name="regexlist" value="true"
                                                                       checked>
-                                                            Blacklist (wildcard)</label>
+                                                            Regex filters</label>
                                                     </div>
                                                 </div>
                                             </div>

From ed8dbfd10e13cbeb76b361bf1c3f19643291bec2 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 14 Jul 2018 15:34:42 +0200
Subject: [PATCH 158/172] Show number of processed items when importing
 whitelist, blacklist, and regex filters

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 8f0a46e3..d11283df 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -108,7 +108,7 @@ if(isset($_POST["action"]))
 			if(isset($_POST["blacklist"]) && $file->getFilename() === "blacklist.txt")
 			{
 				$blacklist = process_file(file_get_contents($file));
-				echo "Processing blacklist.txt<br>\n";
+				echo "Processing blacklist.txt (".count($blacklist)." entries)<br>\n";
 				exec("sudo pihole -b -nr --nuke");
 				exec("sudo pihole -b -q -nr ".implode(" ", $blacklist));
 				$importedsomething = true;
@@ -116,7 +116,7 @@ if(isset($_POST["action"]))
 			if(isset($_POST["whitelist"]) && $file->getFilename() === "whitelist.txt")
 			{
 				$whitelist = process_file(file_get_contents($file));
-				echo "Processing whitelist.txt<br>\n";
+				echo "Processing whitelist.txt (".count($whitelist)." entries)<br>\n";
 				exec("sudo pihole -w -nr --nuke");
 				exec("sudo pihole -w -q -nr ".implode(" ", $whitelist));
 				$importedsomething = true;
@@ -125,7 +125,7 @@ if(isset($_POST["action"]))
 			if(isset($_POST["regexlist"]) && $file->getFilename() === "regex.list")
 			{
 				$regexlist = process_file(file_get_contents($file),false);
-				echo "Processing regex.list<br>\n";
+				echo "Processing regex.list (".count($regexlist)." entries)<br>\n";
 				exec("sudo pihole --regex -nr --nuke");
 				exec("sudo pihole --regex -q -nr ".implode(" ", $regexlist));
 				$importedsomething = true;

From e67695d51ac9f3eb5f307d1a913b15aa41d0596d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 14 Jul 2018 15:46:22 +0200
Subject: [PATCH 159/172] Add files backed up from /etc/dnsmasq.d into a
 separate directory to tidy up the generated archive

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index d11283df..0d95a2d3 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -14,14 +14,14 @@ if (php_sapi_name() !== "cli") {
 	check_csrf(isset($_POST["token"]) ? $_POST["token"] : "");
 }
 
-function archive_add_file($path,$name)
+function archive_add_file($path,$name,$subdir="")
 {
 	global $archive;
 	if(file_exists($path.$name))
-		$archive[$name] = file_get_contents($path.$name);
+		$archive[$subdir.$name] = file_get_contents($path.$name);
 }
 
-function archive_add_directory($path)
+function archive_add_directory($path,$subdir="")
 {
 	if($dir = opendir($path))
 	{
@@ -29,7 +29,7 @@ function archive_add_directory($path)
 		{
 			if($entry !== "." && $entry !== "..")
 			{
-				archive_add_file($path,$entry);
+				archive_add_file($path,$entry,$subdir);
 			}
 		}
 		closedir($dir);
@@ -161,7 +161,7 @@ else
 	archive_add_file("/etc/pihole/","setupVars.conf");
 	archive_add_file("/etc/pihole/","auditlog.list");
 	archive_add_file("/etc/pihole/","regex.list");
-	archive_add_directory("/etc/dnsmasq.d/");
+	archive_add_directory("/etc/dnsmasq.d/","dnsmasq.d/");
 
 	$archive->compress(Phar::GZ); // Creates a gziped copy
 	unlink($archive_file_name); // Unlink original tar file as it is not needed anymore

From 65d0c7a1d9be6b5e0005fd401a2c322b33be0be8 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 14 Jul 2018 22:25:17 +0200
Subject: [PATCH 160/172] Also try to import legacy wildcard list if found in
 imported teleporter archive

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 0d95a2d3..380eb613 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -130,6 +130,17 @@ if(isset($_POST["action"]))
 				exec("sudo pihole --regex -q -nr ".implode(" ", $regexlist));
 				$importedsomething = true;
 			}
+
+			// Also try to import legacy wildcard list if found
+			if(isset($_POST["regexlist"]) && $file->getFilename() === "wildcardblocking.txt")
+			{
+				$wildlist = process_file(file_get_contents($file));
+				echo "Processing wildcardblocking.txt (".count($wildlist)." entries)<br>\n";
+				exec("sudo pihole --wild -nr --nuke");
+				exec("sudo pihole --wild -q -nr ".implode(" ", $wildlist));
+				$importedsomething = true;
+			}
+
 			if($importedsomething)
 			{
 				exec("sudo pihole restartdns");

From 3e4613caf0ec64a62956ba489a692934a11e260e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Jul 2018 12:48:46 +0200
Subject: [PATCH 161/172] Move function add_regex($regex) to func.php

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/add.php  | 17 -----------------
 scripts/pi-hole/php/func.php | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 2d3601f8..d6f6d6c0 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -14,23 +14,6 @@ $type = $_POST['list'];
 // All of the verification for list editing
 list_verify($type);
 
-function add_regex($regex)
-{
-    global $regexfile;
-    if(file_put_contents($regexfile, "\n".$regex, FILE_APPEND) === FALSE)
-    {
-        $err = error_get_last()["message"];
-        echo "Unable to add regex \"".htmlspecialchars($regex)."\" to ${regexfile}<br>Error message: $err";
-    }
-    else
-    {
-        // Send SIGHUP to pihole-FTL using a frontend command
-        // to force reloading of the regex domains
-        // This will also wipe the resolver's cache
-        echo exec("sudo pihole restartdns reload");
-    }
-}
-
 switch($type) {
     case "white":
         if(!isset($_POST["auditlog"]))
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index bc353218..edd0cbcb 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -45,4 +45,21 @@ if(!function_exists('hash_equals')) {
    }
 }
 
+function add_regex($regex)
+{
+    global $regexfile;
+    if(file_put_contents($regexfile, "\n".$regex, FILE_APPEND) === FALSE)
+    {
+        $err = error_get_last()["message"];
+        echo "Unable to add regex \"".htmlspecialchars($regex)."\" to ${regexfile}<br>Error message: $err";
+    }
+    else
+    {
+        // Send SIGHUP to pihole-FTL using a frontend command
+        // to force reloading of the regex domains
+        // This will also wipe the resolver's cache
+        echo exec("sudo pihole restartdns reload");
+    }
+}
+
 ?>

From 7c9f09db0e49a5cb8ed0c095903c0e615b66cd83 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 15 Jul 2018 12:56:40 +0200
Subject: [PATCH 162/172] Directly write imported regex file to disk instead of
 useing bash callbacks

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/func.php       | 4 ++--
 scripts/pi-hole/php/teleporter.php | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index edd0cbcb..fb9cda82 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -45,10 +45,10 @@ if(!function_exists('hash_equals')) {
    }
 }
 
-function add_regex($regex)
+function add_regex($regex, $mode=FILE_APPEND, $append="\n")
 {
     global $regexfile;
-    if(file_put_contents($regexfile, "\n".$regex, FILE_APPEND) === FALSE)
+    if(file_put_contents($regexfile, $append.$regex, $mode) === FALSE)
     {
         $err = error_get_last()["message"];
         echo "Unable to add regex \"".htmlspecialchars($regex)."\" to ${regexfile}<br>Error message: $err";
diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 380eb613..dbdb637d 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -113,6 +113,7 @@ if(isset($_POST["action"]))
 				exec("sudo pihole -b -q -nr ".implode(" ", $blacklist));
 				$importedsomething = true;
 			}
+
 			if(isset($_POST["whitelist"]) && $file->getFilename() === "whitelist.txt")
 			{
 				$whitelist = process_file(file_get_contents($file));
@@ -124,10 +125,11 @@ if(isset($_POST["action"]))
 
 			if(isset($_POST["regexlist"]) && $file->getFilename() === "regex.list")
 			{
-				$regexlist = process_file(file_get_contents($file),false);
+				$regexraw = file_get_contents($file);
+				$regexlist = process_file($regexraw,false);
 				echo "Processing regex.list (".count($regexlist)." entries)<br>\n";
-				exec("sudo pihole --regex -nr --nuke");
-				exec("sudo pihole --regex -q -nr ".implode(" ", $regexlist));
+				// NULL = overwrite (or create) the regex filter file
+				add_regex($regexraw, NULL,"");
 				$importedsomething = true;
 			}
 

From 4542a68f2f6993e84318edcafbe662e1bb4dd0b2 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 15 Jul 2018 15:04:07 -0400
Subject: [PATCH 163/172] Fix y value of tooltip scaling incorrectly

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index c765b33f..d646bb80 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -99,7 +99,7 @@ var customTooltips = function(tooltip) {
         }
         tooltipEl.style.opacity = 1;
         tooltipEl.style.left = position.left + width + "px";
-        tooltipEl.style.top = position.top + tooltip.caretY + "px";
+        tooltipEl.style.top = position.top + tooltip.caretY + window.scrollY + "px";
         tooltipEl.style.fontFamily = tooltip._bodyFontFamily;
         tooltipEl.style.fontSize = tooltip.bodyFontSize + "px";
         tooltipEl.style.fontStyle = tooltip._bodyFontStyle;

From 846e3e4184925d0295fdaa76bc5b0f6385e333df Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 15 Jul 2018 15:04:38 -0400
Subject: [PATCH 164/172] Fix lag by limiting rendering to every 50ms

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/js/index.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index d646bb80..18f1d6aa 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -29,6 +29,8 @@ function objectToArray(p){
     return [idx,arr];
 }
 
+var lastTooltipTime = 0;
+
 var customTooltips = function(tooltip) {
         // Tooltip Element
         var tooltipEl = document.getElementById("chartjs-tooltip");
@@ -43,6 +45,15 @@ var customTooltips = function(tooltip) {
                 tooltipEl.style.opacity = 0;
                 return;
         }
+
+        // Limit rendering to once every 50ms. This gives the DOM time to react,
+        // and avoids "lag" caused by not giving the DOM time to reapply CSS.
+        var now = Date.now()
+        if(now - lastTooltipTime < 50) {
+            return;
+        }
+        lastTooltipTime = now;
+
         // Set caret Position
         tooltipEl.classList.remove("above", "below", "no-transform");
         if (tooltip.yAlign) {

From dd77a6af5854131a2d04db1a212fe8c0f2eb96e1 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 15 Jul 2018 16:43:14 -0400
Subject: [PATCH 165/172] Add missing semicolon

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 18f1d6aa..8c28f0bf 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -48,7 +48,7 @@ var customTooltips = function(tooltip) {
 
         // Limit rendering to once every 50ms. This gives the DOM time to react,
         // and avoids "lag" caused by not giving the DOM time to reapply CSS.
-        var now = Date.now()
+        var now = Date.now();
         if(now - lastTooltipTime < 50) {
             return;
         }

From cca2f6fc6934ee9b2ef8136aa6bf934c5c74ef80 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 16 Jul 2018 18:35:30 +0200
Subject: [PATCH 166/172] Always start with empty search field on Query Log
 page

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 3ea38cff..79a9823b 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -275,9 +275,11 @@ $(document).ready(function() {
             var data = localStorage.getItem("query_log_table");
             // Return if not available
             if(data === null){ return null; }
-            // Ensure that we always start on the first page (most recent query)
             data = JSON.parse(data);
+            // Always start on the first page to show most recent queries
             data["start"] = 0;
+            // Always start with empty search field
+            data["search"]["search"] = "";
             // Apply loaded state to table
             return data;
         },

From 2188103b5c9f7f84d006bfea5f4a890cbf3e77e8 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 22 Jul 2018 11:57:16 -0400
Subject: [PATCH 167/172] Update blocklist wording and help page

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 gravity.php                    |  4 ++--
 help.php                       | 40 +++++++++++++++-------------------
 queryads.php                   |  2 +-
 scripts/pi-hole/php/header.php |  6 ++---
 settings.php                   |  6 ++---
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/gravity.php b/gravity.php
index f11e6ab7..1b1bd3bb 100644
--- a/gravity.php
+++ b/gravity.php
@@ -9,7 +9,7 @@
 ?>
 <!-- Title -->
 <div class="page-header">
-    <h1>Update list of ad-serving domains / blacklist / whitelist</h1>
+    <h1>Update Gravity (list of blocked domains)</h1>
 </div>
 
 <!-- Alerts -->
@@ -22,7 +22,7 @@
     Success!
 </div>
 
-<button class="btn btn-lg btn-primary btn-block" id="gravityBtn">Update Lists</button>
+<button class="btn btn-lg btn-primary btn-block" id="gravityBtn">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
 <?php
diff --git a/help.php b/help.php
index c4c932d1..fdf2ec16 100644
--- a/help.php
+++ b/help.php
@@ -82,14 +82,14 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-    <h2>Tools &rarr; Update Lists</h2>
-    <p>Will download any updates from the third-party ad-serving domain lists that we source. By default, this command runs once a week via cron (Sunday at 01:59).</p>
+    <h2>Tools &rarr; Update Gravity</h2>
+    <p>Will download any updates from the third-party blocklists that we source. By default, this command runs once a week via cron (Sunday).</p>
     </div>
 </div>
 <div class="row">
     <div class="col-md-12">
-    <h2>Tools &rarr; Query adlists</h2>
-    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the block lists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <samp>apple.com</samp> and <samp>microsoft.com</samp> to their block list.</p>
+    <h2>Tools &rarr; Query Lists</h2>
+    This function is useful to find out what list a domain appears on. Since we don't control what the third-parties put on the blocklists, you may find that a domain you normally visit stops working. If this is the case, you could run  this command to scan for strings in the list of blocked domains and it will return the list the domain is found on. This proved useful a while back when the Mahakala list was adding <samp>apple.com</samp> and <samp>microsoft.com</samp> to their block list.</p>
     </div>
 </div>
 <div class="row">
@@ -102,26 +102,20 @@
     <div class="col-md-12">
     <h2>Settings</h2>
     Change settings for the Pi-hole
-    <h4>Networking</h4>
-    Displays information about the interfaces of the Pi-hole. No changes possible.
-    <h4>Pi-hole DHCP Server</h4>
-    Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled.
-    <h4>Upstream DNS Servers</h4>
+    <h4>System</h4>
+    Displays network and other system information of Pi-hole. At the bottom there is a "Danger Zone" with actions such as disable query logging and reboot.
+    <h4>Blocklists</h4>
+    View and edit the blocklists sourced for blocked domains.
+    <h4>DNS</h4>
     Customize used upstream DNS servers + advanced settings for DNS servers. Note that any number of DNS servers may be enabled at a time.
-    <h4>Query Logging</h4>
-    Enabled/disable query logging on your Pi-hole + provide option to flush the log
-    <h4>API</h4>
-    Change settings which apply to the API as well as the web UI
-    <ul>
-      <li>Show permitted domain entries: Toogle permitted queries in Query Log + Top Domains on Main Page</li>
-      <li>Show blockes domain entries: Toogle blocked queries in Query Log + Top Ads on Main Page</li>
-      <li>Privacy mode: Replace IPs in query log with "hidden"</li>
-    </ul>
-    <h4>Web User Interface</h4>
-    Other settings which affect the webUI but not the API of Pi-hole
-    <h4>System Administration</h4>
-    Apply system-wide actions like restarting of the server
-    </div>
+    <h4>DHCP</h4>
+    Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled.
+    <h4>API / Web Interface</h4>
+    Change settings which apply to the API as well as the web interface
+    <h4>Privacy</h4>
+    Set the privacy level for queries. Note that decreasing the privacy level will not disclose previously hidden query data.
+    <h4>Teleporter</h4>
+    Import and export Pi-hole settings.
 </div>
 <div class="row">
     <div class="col-md-12">
diff --git a/queryads.php b/queryads.php
index 14bec1dd..0fe5850c 100644
--- a/queryads.php
+++ b/queryads.php
@@ -9,7 +9,7 @@
 ?>
 <!-- Title -->
 <div class="page-header">
-    <h1>Find Ad Domain In Lists</h1>
+    <h1>Find Blocked Domain In Lists</h1>
 </div>
 <!-- Domain Input -->
 <div class="form-group input-group">
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index de3c687b..49727926 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -504,13 +504,13 @@ if($auth) {
                     <!-- Run gravity.sh -->
                     <li<?php if($scriptname === "gravity.php"){ ?> class="active"<?php } ?>>
                         <a href="gravity.php">
-                            <i class="fa fa-arrow-circle-down"></i> <span>Update Lists</span>
+                            <i class="fa fa-arrow-circle-down"></i> <span>Update Gravity</span>
                         </a>
                     </li>
-                    <!-- Query adlists -->
+                    <!-- Query Lists -->
                     <li<?php if($scriptname === "queryads.php"){ ?> class="active"<?php } ?>>
                         <a href="queryads.php">
-                            <i class="fa fa-search"></i> <span>Query adlists</span>
+                            <i class="fa fa-search"></i> <span>Query Lists</span>
                         </a>
                     </li>
                     <!-- Audit log -->
diff --git a/settings.php b/settings.php
index f824dcf2..73783d44 100644
--- a/settings.php
+++ b/settings.php
@@ -236,7 +236,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
                 <li<?php if($tab === "sysadmin"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#sysadmin">System</a></li>
-                <li<?php if($tab === "blocklists"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#blocklists">Block Lists</a></li>
+                <li<?php if($tab === "blocklists"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#blocklists">Blocklists</a></li>
                 <li<?php if($tab === "dns"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#dns">DNS</a></li>
                 <li<?php if($tab === "piholedhcp"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#piholedhcp">DHCP</a></li>
                 <li<?php if($tab === "api"){ ?> class="active"<?php } ?>><a data-toggle="tab" href="#api">API / Web interface</a></li>
@@ -251,7 +251,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                             <div class="col-md-12">
                                 <div class="box">
                                     <div class="box-header with-border">
-                                        <h3 class="box-title">Lists used to generate Pi-hole's Gravity: <?php echo count($adlist); ?></h3>
+                                        <h3 class="box-title">Blocklists used to generate Pi-hole's Gravity: <?php echo count($adlist); ?></h3>
                                     </div>
                                     <div class="box-body">
                                         <div class="table-responsive">
@@ -284,7 +284,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                             </table>
                                         </div>
                                         <div class="form-group">
-                                            <textarea name="newuserlists" class="form-control" rows="1" placeholder="Enter one URL per line to add new ad lists"></textarea>
+                                            <textarea name="newuserlists" class="form-control" rows="1" placeholder="Enter one URL per line to add new blocklists"></textarea>
                                         </div>
                                         <input type="hidden" name="field" value="adlists">
                                         <input type="hidden" name="token" value="<?php echo $token ?>">

From 34f89a83e726edce6d8e8bd92315c9c91e49955a Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sun, 22 Jul 2018 12:26:45 -0400
Subject: [PATCH 168/172] Fill in empty db graph data intervals with zero

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 api_db.php | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/api_db.php b/api_db.php
index aee13616..567e2c32 100644
--- a/api_db.php
+++ b/api_db.php
@@ -325,13 +325,38 @@ if (isset($_GET['getGraphData']) && $auth)
 	$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
 	$results = $stmt->execute();
 
-	$domains = array();
+	// Parse the DB result into graph data, filling in missing sections with zero
+	function parseDBData($results, $interval) {
+		$data = array();
+		$min = null;
+		$max = null;
 
-	if(!is_bool($results))
-		while ($row = $results->fetchArray())
-		{
-			$domains[$row[0]] = intval($row[1]);
+		if(!is_bool($results)) {
+			// Read in the data
+			while($row = $results->fetchArray()) {
+				// Get min and max timestamps
+				if($min === null || $min > $row[0])
+					$min = $row[0];
+
+				if($max === null || $max < $row[0])
+					$max = $row[0];
+
+				// Get the non-zero graph data
+				$data[$row[0]] = intval($row[1]);
+			}
+
+			// Fill the missing intervals with zero
+			for($i = $min; $i < $max; $i += $interval) {
+				if(!array_key_exists($i, $data))
+					$data[$i] = 0;
+			}
 		}
+
+		return $data;
+	}
+
+	$domains = parseDBData($results, $interval);
+
 	$result = array('domains_over_time' => $domains);
 	$data = array_merge($data, $result);
 
@@ -342,13 +367,8 @@ if (isset($_GET['getGraphData']) && $auth)
 	$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
 	$results = $stmt->execute();
 
-	$addomains = array();
+	$addomains = parseDBData($results, $interval);
 
-	if(!is_bool($results))
-		while ($row = $results->fetchArray())
-		{
-			$addomains[$row[0]] = intval($row[1]);
-		}
 	$result = array('ads_over_time' => $addomains);
 	$data = array_merge($data, $result);
 }

From 098a0022709f1aad1198bfa3ec210065158d7bd1 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Sun, 29 Jul 2018 16:16:20 -0700
Subject: [PATCH 169/172] Link to docs is 404. Add target landing page.

Add `/overview/` to URL.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/list.php b/list.php
index ff06b01f..cc566e92 100644
--- a/list.php
+++ b/list.php
@@ -67,7 +67,7 @@ function getFullName() {
 <?php } ?>
 <ul class="list-group" id="list"></ul>
 <?php if($list === "black") { ?>
-<h3><a href="https://docs.pi-hole.net/ftldns/regex/" target="_blank" title="Click for Pi-hole Regex documentation">Regex</a> &amp; Wildcard blocking</h3>
+<h3><a href="https://docs.pi-hole.net/ftldns/regex/overview/" target="_blank" title="Click for Pi-hole Regex documentation">Regex</a> &amp; Wildcard blocking</h3>
 <ul class="list-group" id="list-regex"></ul>
 <?php } ?>
 

From 97023278b33e9da17618892fb91ae6f8c94d94e1 Mon Sep 17 00:00:00 2001
From: Mark Drobnak <mark.drobnak@gmail.com>
Date: Tue, 31 Jul 2018 21:12:41 -0400
Subject: [PATCH 170/172] Ignore commented lines in list files

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
---
 scripts/pi-hole/php/get.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
index a05b4eea..63e69ec9 100644
--- a/scripts/pi-hole/php/get.php
+++ b/scripts/pi-hole/php/get.php
@@ -38,9 +38,9 @@ function getListContent($listname) {
     $rawList = file_get_contents(checkfile($basedir.$listname));
     $list = explode("\n", $rawList);
 
-    // Get rid of empty lines
+    // Get rid of empty lines and comments
     for($i = sizeof($list)-1; $i >= 0; $i--) {
-        if(strlen($list[$i]) < 1)
+        if(strlen($list[$i]) < 1 || $list[$i][0] === '#')
             unset($list[$i]);
     }
 

From b7ad22c51e78898dba6c22558d2109766c5aabc9 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Tue, 31 Jul 2018 21:35:27 -0400
Subject: [PATCH 171/172] Use simpler regex format for wildcards

Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index d6f6d6c0..441b02f4 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -37,7 +37,7 @@ switch($type) {
         // Escape "." so it won't be interpreted as the wildcard character
         $domain = str_replace(".","\.",$_POST['domain']);
         // Add regex filter for legacy wildcard behavior
-        add_regex("((^)|(\.))".$domain."$");
+        add_regex("\.?".$domain."$");
         break;
     case "regex":
         add_regex($_POST['domain']);

From 57698ba45a8df15c44ccbdc184801232343ddc0d Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Tue, 31 Jul 2018 22:17:25 -0400
Subject: [PATCH 172/172] Fix permissive regex

The `\.?` is too permissive, letting in anything that ends in the domain

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 scripts/pi-hole/php/add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index 441b02f4..dc6e87c2 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -37,7 +37,7 @@ switch($type) {
         // Escape "." so it won't be interpreted as the wildcard character
         $domain = str_replace(".","\.",$_POST['domain']);
         // Add regex filter for legacy wildcard behavior
-        add_regex("\.?".$domain."$");
+        add_regex("(^|\.)".$domain."$");
         break;
     case "regex":
         add_regex($_POST['domain']);