From 17df978be04a42a0276e57f219d029eb1e7e8e21 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 11:55:01 +0100 Subject: [PATCH 1/6] Add 'Flush Logs' button also to the Query Logging dialog box --- settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.php b/settings.php index 21e89fc1..9da34f46 100644 --- a/settings.php +++ b/settings.php @@ -455,6 +455,7 @@
+ From a6ec11cb6894e16938c25c7d322be6dc8b3d41d8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 11:56:37 +0100 Subject: [PATCH 2/6] Add tooltips to the advanced DNS check boxes --- settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.php b/settings.php index 9da34f46..fe6c7362 100644 --- a/settings.php +++ b/settings.php @@ -403,10 +403,10 @@
-
+
-
+

Note that enabling these two options may increase your privacy slightly, but may also prevent you from being able to access local hostnames if the Pi-Hole is not used as DHCP server

From f4e5339f672d4920f3aec939d6315eb8c941f33b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 12:01:23 +0100 Subject: [PATCH 3/6] Resolve "Undefined index: DHCP_LEASETIME" warning --- settings.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/settings.php b/settings.php index fe6c7362..86fcae4a 100644 --- a/settings.php +++ b/settings.php @@ -107,10 +107,18 @@ $DHCPstart = $setupVars["DHCP_START"]; $DHCPend = $setupVars["DHCP_END"]; $DHCProuter = $setupVars["DHCP_ROUTER"]; - $DHCPleasetime = $setupVars["DHCP_LEASETIME"]; - if(strlen($DHCPleasetime) < 1) + // This setting has been added later, we have to check if it exists + if(isset($setupVars["DHCP_LEASETIME"])) + { + $DHCPleasetime = $setupVars["DHCP_LEASETIME"]; + if(strlen($DHCPleasetime) < 1) + { + // Fallback if empty string + $DHCPleasetime = 24; + } + } + else { - // Fallback if it was not set before $DHCPleasetime = 24; } } From acc3616d75eb893ab636c91c2260065e18c093e7 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 12:02:12 +0100 Subject: [PATCH 4/6] Fix indentation of "Privacy mode" check box --- settings.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/settings.php b/settings.php index 86fcae4a..ec413d78 100644 --- a/settings.php +++ b/settings.php @@ -571,8 +571,10 @@

Privacy mode

-
-
+
+
+
+
From 725233871a8daf76794ea163763411b5073afbff Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 12:11:32 +0100 Subject: [PATCH 5/6] Show warning if PHP has been compiled without IPv6 support (compile flag --disable-ipv6) --- settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.php b/settings.php index ec413d78..37f01c09 100644 --- a/settings.php +++ b/settings.php @@ -81,6 +81,7 @@
+

Warning: PHP has been compiled without IPv6 support.

From 4209320b8727447f5285bdb6443135cae6fe59be Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 13:17:45 +0100 Subject: [PATCH 6/6] Add glowing notification that users should disabled their router's DHCP server when first activating the DHCP server --- scripts/pi-hole/js/settings.js | 1 + settings.php | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index e7e613ea..27620f5a 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -55,6 +55,7 @@ $(".confirm-flushlogs").confirm({ $("#DHCPchk").click(function() { $("input.DHCPgroup").prop("disabled", !this.checked); + $("#dhcpnotice").prop("hidden", !this.checked).addClass("lookatme"); }); var leasetable; diff --git a/settings.php b/settings.php index 37f01c09..175af9f1 100644 --- a/settings.php +++ b/settings.php @@ -9,6 +9,16 @@ 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; + } @@ -152,8 +162,13 @@
-
-
+
+
+
+
+
+
+

hidden>Make sure your router's DHCP server is disabled when using the Pi-hole DHCP server!