From 15f3433ba5a0c6f30fbf1085f7cb318acf43d29a Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 18 Oct 2017 16:04:31 +0200 Subject: [PATCH 01/46] Re-designed settings page using Bootstrap Tabs. No functional change. Signed-off-by: DL6ER --- settings.php | 368 +++++++++++++++++++++++---------------------------- 1 file changed, 163 insertions(+), 205 deletions(-) diff --git a/settings.php b/settings.php index 2ef1de67..a09cbd26 100644 --- a/settings.php +++ b/settings.php @@ -63,8 +63,23 @@ if(isset($_POST["submit"])) { -
-
+
+
+
+ +
+
-
-
-

Networking

-
-
@@ -135,7 +145,7 @@ if(isset($_POST["submit"])) {
-
+
-
-
-

Pi-hole DHCP Server

-
-
+
-
-

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

-
- +
+ +
+
+
+
+
From
+ disabled>
-
-
-
-
From
- disabled> -
+
+
+
+
+
+
To
+ disabled>
+
+
+
+ +
+
+
Router
+ disabled>
-
-
-
-
To
- disabled> -
-
-
-
- -
-
-
Router
- disabled> -
-
-
-
+
+
+

Advanced DHCP settings

@@ -275,7 +279,7 @@ if(isset($_POST["submit"])) {
-
+
-
-
-
+
- -
- +
+
+
-
-
-

Upstream DNS Servers

-
-
+
@@ -596,17 +593,14 @@ readStaticLeasesFile();
-
-
-
-
-
-
+
+
+
-
-
-

Query Logging (size of log )

-
-

Current status: Enabled (recommended) @@ -637,8 +626,6 @@ readStaticLeasesFile();

Note that disabling will render graphs on the web user interface useless

-
-
@@ -652,7 +639,39 @@ readStaticLeasesFile();
-
+
+ +
+
+
+ + $value) { ?> +
+
+ +
+
+ +
+ +
+ + + + +
+
+
+
+
-
-
-

Pi-Hole's Block Lists

-
-
-
-
-
- - $value) { ?> -
-
- -
-
- -
- -
-
-
-
- - - - -
-
-
-
-
-

API

-
-
+
+

Top Lists

Exclude the following domains from being shown in

-
-
- - -
+
+
+
+ +
-
-
- - -
+
+
+
+ +
+
+

Privacy settings (Statistics / Query Log)

+
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+

Privacy mode

-
-
-
-
+
-
+
+
-
-
-

Web User Interface

-
-
+
+
Query Log Page
@@ -813,58 +791,13 @@ readStaticLeasesFile();
-
-
-
+
-
- -
-

Blocking Page

-
-

Show page with details if a site is blocked

-
-
-
-

If Yes: Hide content for in page ads?

-
-
-
-
-*/ ?> -
-
-

System Administration

-
-
- - - - - -
- - -
-
- - -
-
- - -
-
- - -
-
-
+
-
-
-

Pi-hole FTL (RunningNot running)

-
+
+ 
+FTL version: 
+
+Process identifier (PID): 
+
+Time FTL started: 
+
+User / Group:  / 
+
+Total CPU utilization: %
+Memory utilization: %
+Used memory: 
+
+
-
- FTL version:
- Process identifier (PID):
- Time FTL started:
- User / Group: /
- Total CPU utilization: %
- Memory utilization: %
- Used memory:
- -
-
-
-
-

Pi-hole Teleporter

-
-
-
+
+
@@ -932,6 +861,35 @@ if($FTL)

The PHP extension Phar is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter. +

+
+
+
+

Danger area!

+ + + + + + + + + +
+ + +
+
+ + +
+
+ + +
+
+
+
From aa546d4c7ec26833eb9499413948c13c5ffe0e59 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 18 Oct 2017 22:52:53 +0100 Subject: [PATCH 02/46] Move networking to `System` box, tidy up DHCP. (could probably do with more tidying) Signed-off-by: Adam Warner --- settings.php | 1889 ++++++++++++++++++++++++++++---------------------- 1 file changed, 1049 insertions(+), 840 deletions(-) diff --git a/settings.php b/settings.php index a09cbd26..51df6e0a 100644 --- a/settings.php +++ b/settings.php @@ -5,768 +5,853 @@ * * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ - 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"); +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"); -function command_exist($cmd) { - return !empty(shell_exec(sprintf("which %s", escapeshellarg($cmd)))); +function command_exist($cmd) +{ + return !empty(shell_exec(sprintf("which %s", escapeshellarg($cmd)))); } + ?> refresh to the gravity page and start updating immediately -?> - - +if (isset($_POST["submit"])) { + if ($_POST["submit"] == "saveupdate") { + // If that is the case -> refresh to the gravity page and start updating immediately + ?> + + - - + + - 0){ ?> - + 0) { ?> + - 0){ ?> - + 0) { ?> +
-
-
- -
-
- -
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
- -
-

Warning: PHP has been compiled without IPv6 support.

-
-
- -
-
- -
-
-
-
- +
+ +
+
+ -
-
-
-
-
-
-

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

-
-
- -
-
-
-
-
From
- disabled> -
-
-
-
-
-
-
To
- disabled> -
-
-
-
- -
-
-
Router
- disabled> -
-
-
-
-
-
-

Advanced DHCP settings

-
-
-
-
-
-
-
-
-
- -
-
-
Domain
- disabled> -
-
-
-
- -
-
-
Lease time in hours
- disabled> -
-
-

Hint: 0 = infinite, 24 = one day, 168 = one week, 744 = one month, 8760 = one year

-
-
-
-
- - function convertseconds($argument) { - $seconds = round($argument); - if($seconds < 60) - { - return sprintf('%ds', $seconds); - } - elseif($seconds < 3600) - { - return sprintf('%dm %ds', ($seconds/60), ($seconds%60)); - } - elseif($seconds < 86400) - { - return sprintf('%dh %dm %ds', ($seconds/3600%24),($seconds/60%60), ($seconds%60)); - } - else - { - return sprintf('%dd %dh %dm %ds', ($seconds/86400), ($seconds/3600%24),($seconds/60%60), ($seconds%60)); - } - } +
+ +
+
+
+

DHCP Settings

+
+
+
+
+
+
+
+
+

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

+
- while(!feof($dhcpleases) && $leasesfile) - { - $line = explode(" ",trim(fgets($dhcpleases))); - if(count($line) == 5) - { - $counter = intval($line[0]); - if($counter == 0) - { - $time = "Infinite"; - } - elseif($counter <= 315360000) // 10 years in seconds - { - $time = convertseconds($counter); - } - else // Assume time stamp - { - $time = convertseconds($counter-time()); - } +
+
+
+ +
+
+
- if(strpos($line[2], ':') !== false) - { - // IPv6 address - $type = 6; - } - else - { - // IPv4 lease - $type = 4; - } - - $host = $line[3]; - if($host == "*") - { - $host = "unknown"; - } - - $clid = $line[4]; - if($clid == "*") - { - $clid = "unknown"; - } - - array_push($dhcp_leases,["TIME"=>$time, "hwaddr"=>strtoupper($line[1]), "IP"=>$line[2], "host"=>$host, "clid"=>$clid, "type"=>$type]); - } - } -} - -readStaticLeasesFile(); -?> -
-
collapsed-box"> -
-

DHCP leases

-
-
-
-
- - - - - - - - - - - -
Remaining lease time:
DHCP UID: "> - -
MAC addressIP addressHostname

-
-
- - - - - - - - - - - - - - - - -
MAC addressIP addressHostname
0){ ?>
-

Specifying the MAC address is mandatory and only one entry per MAC address is allowed. If the IP address is omitted and a host name is given, the IP address will still be generated dynamically and the specified host name will be used. If the host name is omitted, only a static lease will be added.

-
-
-
- - - - -
-
-
-
- -
-
-
- - - - - - - - $value) { ?> - - - - - - - - - - - - -
IPv4IPv6Name
">" value="true" checked >">" value="true" checked >">" value="true" checked disabled >">" value="true" checked disabled >
-
-
- -
- -
-
checked>
- value=""> -
- -
-
checked>
- value=""> -
- -
-
checked>
- value=""> -
- -
-
checked>
- value=""> -
-
-
-
-
-
-

Advanced DNS settings

-
-
-
-
-
-
-
-
-
-
-

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

-
-
-
-

Validate DNS replies and cache DNSSEC data. When forwarding DNS queries, Pi-hole requests the DNSSEC records needed to validate the replies. Use Google or Norton DNS servers when activating DNSSEC. Note that the size of your log might increase significantly when enabling DNSSEC. A DNSSEC resolver test can be found here.

- -
- -
- -
-
- -
-
- -
-
- -
-
-
- - - -
-
-
-
-
- -

Current status: - - Enabled (recommended) - - Disabled -

- -

Note that disabling will render graphs on the web user interface useless

- -
- - - - - - - - - - -
-
-
- -
-
-
- - $value) { ?> -
-
- +
+
From
+ disabled> +
+
+
+
+
+
+
To
+ disabled> +
+
+
+
+
+
+ +
+
+
Router
+ disabled> +
+
+
+
+
- -
-
- - - - + +
+
+
+
+

Advanced DHCP settings

+
+
+
+
+
+
+
+
+ +
+
+
Domain
+ disabled> +
+
+
+
+ +
+
+
Lease time in hours
+ disabled> +
+
+

Hint: 0 = infinite, 24 = one day, 168 = one week, 744 = one month, + 8760 = + one year

+
+
+
+
+
+
+ + +
+ unknown"; + } + + $clid = $line[4]; + if ($clid == "*") { + $clid = "unknown"; + } + + array_push($dhcp_leases, ["TIME" => $time, "hwaddr" => strtoupper($line[1]), "IP" => $line[2], "host" => $host, "clid" => $clid, "type" => $type]); + } + } + } + + readStaticLeasesFile(); + ?> +
+
+
+

DHCP leases

+
+
+
+ + + + + + + + + + + + +
Remaining lease time:
DHCP UID: "> + + + + + +
MAC addressIP addressHostname
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
MAC addressIP addressHostname
0) { ?> +
+ +
+

Specifying the MAC address is mandatory and only one entry per MAC + address is allowed. If the IP address is omitted and a host name is + given, the IP address will still be generated dynamically and the + specified host name will be used. If the host name is omitted, only + a + static lease will be added.

+
+
+
+ + + + +
+
+ +
+
+ +
+
+
+ + + + + + + + $value) { ?> + + + + + + + + + + + + + + + + +
IPv4IPv6Name
">" + value="true" + checked > + ">" + value="true" + checked > + ">" + value="true" + checked disabled > + ">" + value="true" + checked disabled > +
+
+
+ +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
+
+
+
+
+
+

Advanced DNS settings

+
+ +
+
+
+
+
+
+
+
+
+
+

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

+
+
+
+

Validate DNS replies and cache DNSSEC data. When forwarding DNS + queries, + Pi-hole requests the DNSSEC records needed to validate the + replies. Use + Google or Norton DNS servers when activating DNSSEC. Note that + the size of + your log might increase significantly when enabling DNSSEC. A + DNSSEC + resolver test can be found here.

+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
- -
-
- + +

Current status: + + Enabled (recommended) + + Disabled +

+ +

Note that disabling will render graphs on the web user interface useless

+ +
+ + + + + + + + + + +
+
+
- // Exluded clients in API Query Log call - if(isset($setupVars["API_EXCLUDE_CLIENTS"])) - { - $excludedClients = explode(",", $setupVars["API_EXCLUDE_CLIENTS"]); - } else { - $excludedClients = []; - } +
+
+
+ + $value) { ?> +
+
+ +
+
+ +
+ +
+ + + + +
+
+
+
+
+ -
-
-
-

Top Lists

-

Exclude the following domains from being shown in

-
-
-
- - -
-
-
-
- - -
-
-
-

Privacy settings (Statistics / Query Log)

-
-
-
-
-
-
-
-
-
-
-
-
-

Privacy mode

-
-
-
- - - - -
-
-
-
-
- -
-
-
- + +
+
+

Top Lists

+

Exclude the following domains from being shown in

+
+
+
+ + +
+
+
+
+ + +
+
+
+

Privacy settings (Statistics / Query Log)

+
+
+
+
+
+
+
+
+
+
+
+
+

Privacy mode

+
+
+
+ + + + +
+
+ +
+
+ +
+
+
+ Query Log Page
@@ -781,122 +866,246 @@ readStaticLeasesFile();
*/ ?> -

Interface appearance

-
-
-
-

CPU Temperature Unit

-
-
-
-
-
- - - -
-
-
-
- -
- 
-FTL version: 
+                                
Interface appearance

+                                

+                                    

+                                

+                                
CPU Temperature Unit

+                                

+                                    

+                                    

+                                    

+                                    

+                                    

+                                    

+                                

+                                
+                                
+                                
+
+
+ +
+
+ + $FTLversion = exec("/usr/bin/pihole-FTL version"); + } + ?> +
+
+ + 
+                                FTL version: 
 
-Time FTL started: 
+                                Process identifier (PID): 
 
-User / Group:  / 
+                                Time FTL started: 
 
-Total CPU utilization: %
+                                User / Group: 
+                                / 
+
+                                Total CPU utilization: %
 Memory utilization: %
-Used memory: 
-
-
-
-
-
- -
- -
-

Export your Pi-hole lists as downloadable archive

- -
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- - -

Upload only Pi-hole backup files.

- -
-
-
- -

The PHP extension Phar is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter. - -

-
-
-
-

Danger area!

- - - - +Used memory: + +
+
+
+
+
+
+ +
+ +
+

Export your Pi-hole lists as downloadable archive

+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ + +

Upload only Pi-hole backup files.

+ +
+
+
+ +

The PHP extension Phar is not loaded. Please ensure it is installed + and loaded + if you want to use the Pi-hole teleporter. + +

+
+
+
+ -
- - -
-
- - -
-
- - -
-
- - -
-
-
+
+
+
+
-
-
-
+
+
+ +
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+

Warning: PHP + has been + compiled + without IPv6 support.

+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+

Danger Zone!


+
+
+ + + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+ +
+
+
From 6d869a4b9e3517e99ea5f153a2e34c0f0a433c90 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 18 Oct 2017 23:08:46 +0100 Subject: [PATCH 03/46] Tidy up DNS settings tab Signed-off-by: Adam Warner --- settings.php | 420 +++++++++++++++++++++++++++------------------------ 1 file changed, 221 insertions(+), 199 deletions(-) diff --git a/settings.php b/settings.php index 51df6e0a..f6f41dbc 100644 --- a/settings.php +++ b/settings.php @@ -80,6 +80,41 @@ if (isset($_POST["submit"])) {
+ + +
@@ -172,7 +207,7 @@ if (isset($_POST["submit"])) {
- +
@@ -493,184 +528,204 @@ if (isset($_POST["submit"])) { $DNSinterface = "single"; } ?> +
- -
- - - - - - - - $value) { ?> - - - - - - - - - - - - - - - - -
IPv4IPv6Name
">" - value="true" - checked > - ">" - value="true" - checked > - ">" - value="true" - checked disabled > - ">" - value="true" - checked disabled > -
-
-
- -
- -
-
checked> -
- value=""> -
- -
-
checked> -
- value=""> -
- -
-
checked> -
- value=""> -
- -
-
checked> -
- value=""> -
-
-
-
-
-
-

Advanced DNS settings

-
- -
+ + +
+
+
+

Upstream DNS Servers

-
-
-
+
+
+ + + + + + + $value) { ?> + + + + + + + + + + + + + + + + +
IPv4IPv6Name
">" + value="true" + checked > + ">" + value="true" + checked > + ">" + value="true" + checked disabled > + ">" + value="true" + checked disabled > +
-
-
-
-

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

-
-
-
-

Validate DNS replies and cache DNSSEC data. When forwarding DNS - queries, - Pi-hole requests the DNSSEC records needed to validate the - replies. Use - Google or Norton DNS servers when activating DNSSEC. Note that - the size of - your log might increase significantly when enabling DNSSEC. A - DNSSEC - resolver test can be found here.

- -
- -
- -
-
- -
-
- +
+ +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
+ +
+
checked> +
+ value=""> +
-
- - -
+
+
+
+
+
+

Advanced DNS settings

+
+
+
+
+
+
+
+
+
+

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

+
+
+
+

Validate DNS replies and cache DNSSEC data. When forwarding DNS + queries, + Pi-hole requests the DNSSEC records needed to validate the + replies. Use + Google or Norton DNS servers when activating DNSSEC. Note that + the size of + your log might increase significantly when enabling DNSSEC. A + DNSSEC + resolver test can be found here.

+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
%
-
From 5dc556c7b9f77b506848d558c16a583f761bc7b3 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 18 Oct 2017 23:14:26 +0100 Subject: [PATCH 04/46] move some of the PHP parts up above the HTML to make the HTML easier to work with. (WIP) Signed-off-by: Adam Warner --- settings.php | 422 ++++++++++++++++++++++++++------------------------- 1 file changed, 213 insertions(+), 209 deletions(-) diff --git a/settings.php b/settings.php index f6f41dbc..ace77b3e 100644 --- a/settings.php +++ b/settings.php @@ -115,6 +115,118 @@ if (isset($setupVars["IPV6_ADDRESS"])) { $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F"); ?> + + + + + +
@@ -461,77 +573,8 @@ $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
-
-
- - +
@@ -640,128 +683,119 @@ $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
- -
-
-
-
-
-

Advanced DNS settings

-
-
-
-
-
-
-
-
-
-

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

-
-
-
-

Validate DNS replies and cache DNSSEC data. When forwarding DNS - queries, - Pi-hole requests the DNSSEC records needed to validate the - replies. Use - Google or Norton DNS servers when activating DNSSEC. Note that - the size of - your log might increase significantly when enabling DNSSEC. A - DNSSEC - resolver test can be found here.

-
- -
- +
+
+
+
+
+

Advanced DNS settings

+
+
+
+
+
-
- +
+
-
- +

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

+
+
-
+

Validate DNS replies and cache DNSSEC data. When forwarding DNS + queries, + Pi-hole requests the DNSSEC records needed to validate the + replies. Use + Google or Norton DNS servers when activating DNSSEC. Note that + the size of + your log might increase significantly when enabling DNSSEC. A + DNSSEC + resolver test can be found here.

+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
- - -
-
-
- -

Current status: - - Enabled (recommended) - - Disabled -

- -

Note that disabling will render graphs on the web user interface useless

- -
- - - - - - - - - - -
+
+
+

Current status: + + Enabled (recommended) + + Disabled +

+ +

Note that disabling will render graphs on the web user interface useless

+ +
+ + + + + + + + + + +
+
+
@@ -805,36 +839,6 @@ $hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
-
From 37313bf400c7a7a6e3354c68df52667df97989b6 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 18 Oct 2017 23:41:03 +0100 Subject: [PATCH 05/46] Go to specified tab on save or hyperlink Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 73c1dfab..31305b32 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -161,3 +161,9 @@ $("button[id^='adlist-btn-']").on("click", function (e) { $(this).siblings("input[name^='adlist-enable-']").prop("disabled", !status); $(this).siblings("a").css("text-decoration", textType); }); + +// Javascript to go to specified tab on save or hyperlink +$(function () { + var activeTab = $('[href=' + location.hash + ']'); + activeTab && activeTab.tab('show'); +}); From 1e105f1df617111b06fc5a583321ae8c41524150 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 18 Oct 2017 23:45:12 +0100 Subject: [PATCH 06/46] Change hash for save and reload Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 31305b32..44a26f39 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -167,3 +167,7 @@ $(function () { var activeTab = $('[href=' + location.hash + ']'); activeTab && activeTab.tab('show'); }); +// Change hash for save and reload +$('.nav-tabs a').on('shown.bs.tab', function (e) { + window.location.hash = e.target.hash; +}) From 903cb2a4f43247884139e2e65f34df867f9466e3 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 18 Oct 2017 23:55:02 +0100 Subject: [PATCH 07/46] Make DNS the default tab Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 9 +++++---- settings.php | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 44a26f39..155557c3 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -164,10 +164,11 @@ $("button[id^='adlist-btn-']").on("click", function (e) { // Javascript to go to specified tab on save or hyperlink $(function () { - var activeTab = $('[href=' + location.hash + ']'); - activeTab && activeTab.tab('show'); + var activeTab = $("[href=" + location.hash + "]"); + activeTab && activeTab.tab("show"); }); // Change hash for save and reload -$('.nav-tabs a').on('shown.bs.tab', function (e) { +$(".nav-tabs a").on("shown.bs.tab", function (e) { window.location.hash = e.target.hash; -}) + window.scrollTo(0, 0); +}); diff --git a/settings.php b/settings.php index ace77b3e..ae9f45d1 100644 --- a/settings.php +++ b/settings.php @@ -231,8 +231,8 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
-
+
From 4fd274236472d94c925e1c961b10c103920f4d87 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 18 Oct 2017 23:58:23 +0100 Subject: [PATCH 08/46] Added separators Signed-off-by: DL6ER --- settings.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/settings.php b/settings.php index ae9f45d1..bd82f08f 100644 --- a/settings.php +++ b/settings.php @@ -242,6 +242,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
  • System
    • +
    +
    @@ -768,6 +770,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    @@ -797,6 +800,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    @@ -838,6 +842,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    @@ -897,6 +902,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    +
    %
    +
    @@ -1035,6 +1043,7 @@ Memory utilization: %
    +
    From 2a5422cbae1baa9f8e733a2ae82a298d9ff2e1f9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 19 Oct 2017 19:07:48 +0200 Subject: [PATCH 09/46] Fix FTL diagnostic data display by removing erroneously added indentation Signed-off-by: DL6ER --- settings.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/settings.php b/settings.php index bd82f08f..cad8d19c 100644 --- a/settings.php +++ b/settings.php @@ -974,19 +974,18 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { 
    -                                FTL version: 
+FTL version: 
 
-                                Process identifier (PID): 
+Process identifier (PID): 
 
-                                Time FTL started: 
+Time FTL started: 
 
-                                User / Group: 
-                                / 
+User / Group:  / 
 
-                                Total CPU utilization: %
+Total CPU utilization: %
 Memory utilization: %
 Used memory: 
-
    +
    From 7bbf04547c2afcc3496fcf6143bf1c1efade7d93 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 19 Oct 2017 19:10:17 +0200 Subject: [PATCH 10/46] Change buttons on System tab to one per row Signed-off-by: DL6ER --- settings.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/settings.php b/settings.php index cad8d19c..d3aea459 100644 --- a/settings.php +++ b/settings.php @@ -1099,17 +1099,17 @@ Memory utilization: %

    Danger Zone!


    - - - - +

    +

    +

    From 97b7c2458d113e991961e75a076298e6c4beafb8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 19 Oct 2017 19:11:53 +0200 Subject: [PATCH 11/46] Put buttons on Query Logging out of the box (this is how it is also done on the other tabs) Signed-off-by: DL6ER --- settings.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/settings.php b/settings.php index d3aea459..7c933133 100644 --- a/settings.php +++ b/settings.php @@ -783,22 +783,22 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

    Note that disabling will render graphs on the web user interface useless

    - - - - - - - - - - - -
    +
    + + + + + + + + + + +
    From a604a49be4ae57d4383e00c8ca659b65e0bdbc2a Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 19 Oct 2017 19:24:46 +0200 Subject: [PATCH 12/46] Move interface listening behavior to the top right void of the DNS settings tab Signed-off-by: DL6ER --- settings.php | 58 +++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/settings.php b/settings.php index 7c933133..bd50e1ed 100644 --- a/settings.php +++ b/settings.php @@ -578,7 +578,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    +

    Upstream DNS Servers

    @@ -685,8 +685,35 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - - +
    +
    +
    +

    Interface listening behavior

    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +

    Note that the last option should not be used on devices which are directly connected to the Internet. This option is safe if your Pi-hole is located within your local network, i.e. protected behind your router, and you have not forwarded port 53 to this device. In virtually all other cases you have to make sure that your Pi-hole is properly firewalled. +

    +
    +
    +
    +
    @@ -735,31 +762,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { href="http://dnssec.vs.uni-due.de/" target="_blank">here.

    -
    - -
    - -
    -
    - -
    -
    - -
    -
    -
    From 5ef9fe73cd041bda8dc35cd19f30afa13dcb1c93 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 19 Oct 2017 19:26:21 +0200 Subject: [PATCH 13/46] Move IPv6 DHCP check box to the bottom of the Adv. DHCP settings tab Signed-off-by: DL6ER --- settings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/settings.php b/settings.php index bd50e1ed..0bf3f4ce 100644 --- a/settings.php +++ b/settings.php @@ -372,15 +372,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

    Advanced DHCP settings

    -
    -
    -
    -
    -
    @@ -408,6 +399,15 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { 8760 = one year

    +
    +
    +
    +
    +
    @@ -708,7 +708,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { checked >Listen on all interfaces, permit all origins
    -

    Note that the last option should not be used on devices which are directly connected to the Internet. This option is safe if your Pi-hole is located within your local network, i.e. protected behind your router, and you have not forwarded port 53 to this device. In virtually all other cases you have to make sure that your Pi-hole is properly firewalled. +

    Note that the last option should not be used on devices which are directly connected to the Internet. This option is safe if your Pi-hole is located within your local network, i.e. protected behind your router, and you have not forwarded port 53 to this device. In virtually all other cases you have to make sure that your Pi-hole is properly firewalled.

    From 62b8c0d733ecbfc3de08530e906c6cfe59fde714 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 19 Oct 2017 23:06:38 +0100 Subject: [PATCH 14/46] fix dhcp lease table headers/footers. Signed-off-by: Adam Warner --- scripts/pi-hole/js/settings.js | 16 +-- settings.php | 219 ++++++++++++++++++--------------- 2 files changed, 128 insertions(+), 107 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 155557c3..03a7fa72 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -115,12 +115,9 @@ $(document).ready(function() { "columnDefs": [ { "bSortable": false, "orderable": false, targets: -1} ], "paging": false, "scrollCollapse": true, - "scrollY": "200px", + "scrollY": "500px", "scrollX" : true }); - $("#leaseexpand").on( "click", function () { - setTimeout(function(){leasetable.draw();},100); - } ); } if(document.getElementById("DHCPStaticLeasesTable")) { @@ -130,12 +127,15 @@ $(document).ready(function() { "paging": false, "scrollCollapse": true, "scrollY": "200px", - "scrollX" : true + "scrollX" : "100%" }); - $("#leaseexpand").on( "click", function () { - setTimeout(function(){staticleasetable.draw();},100); - } ); } + //call draw() on each table... they don't render properly with scrollX and scrollY set... ¯\_(ツ)_/¯ + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + leasetable.draw(); + staticleasetable.draw(); + }); + } ); // Handle hiding of alerts diff --git a/settings.php b/settings.php index 0bf3f4ce..72746feb 100644 --- a/settings.php +++ b/settings.php @@ -294,7 +294,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { $piHoleDomain = "local"; } ?> -
    @@ -484,84 +483,87 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

    DHCP leases

    -
    - - - - - - - - - - - - -
    Remaining lease time:
    DHCP UID: "> - - - - - -
    MAC addressIP addressHostname
    - -
    -
    -
    -
    - - - - - - - - - - - - +
    +
    + +
    MAC addressIP addressHostname
    + - - - - - - - - - - - - - -
    0) { ?> -
    - -
    -

    Specifying the MAC address is mandatory and only one entry per MAC - address is allowed. If the IP address is omitted and a host name is - given, the IP address will still be generated dynamically and the - specified host name will be used. If the host name is omitted, only - a - static lease will be added.

    + MAC address + IP address + Hostname + + + + + +
    Remaining lease time:
    DHCP UID: "> + + + + + + + + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MAC addressIP addressHostname
    0) { ?> +
    + +
    +

    Specifying the MAC address is mandatory and only one entry per MAC + address is allowed. If the IP address is omitted and a host name is + given, the IP address will still be generated dynamically and the + specified host name will be used. If the host name is omitted, only + a + static lease will be added.

    +
    @@ -696,19 +698,30 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    + checked >Listen + on all interfaces
    Allows only queries from + devices that are at most one hop away (local + devices)
    + checked >Listen + on all interfaces, permit all origins
    -

    Note that the last option should not be used on devices which are directly connected to the Internet. This option is safe if your Pi-hole is located within your local network, i.e. protected behind your router, and you have not forwarded port 53 to this device. In virtually all other cases you have to make sure that your Pi-hole is properly firewalled.

    +

    Note that the last option should not be used on devices which are + directly connected to the Internet. This option is safe if your + Pi-hole is located within your local network, i.e. protected behind + your router, and you have not forwarded port 53 to this device. In + virtually all other cases you have to make sure that your Pi-hole is + properly firewalled.

    @@ -976,18 +989,19 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { 
    -FTL version: 
+                                FTL version: 
 
-Process identifier (PID): 
+                                Process identifier (PID): 
 
-Time FTL started: 
+                                Time FTL started: 
 
-User / Group:  / 
+                                User / Group: 
+                                / 
 
-Total CPU utilization: %
+                                Total CPU utilization: %
 Memory utilization: %
 Used memory: 
-
    +
    @@ -1101,17 +1115,24 @@ Memory utilization: %

    Danger Zone!


    -

    -

    -

    -

    +

    + +

    + +

    +

    + +

    +

    + +

    From f6a05a00b3c804760429caa456b67c0108249093 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 19 Oct 2017 23:09:13 +0100 Subject: [PATCH 15/46] tidy up some experimenting Signed-off-by: Adam Warner --- scripts/pi-hole/js/settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 03a7fa72..b5b274a5 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -115,7 +115,7 @@ $(document).ready(function() { "columnDefs": [ { "bSortable": false, "orderable": false, targets: -1} ], "paging": false, "scrollCollapse": true, - "scrollY": "500px", + "scrollY": "200px", "scrollX" : true }); } @@ -127,7 +127,7 @@ $(document).ready(function() { "paging": false, "scrollCollapse": true, "scrollY": "200px", - "scrollX" : "100%" + "scrollX" : true }); } //call draw() on each table... they don't render properly with scrollX and scrollY set... ¯\_(ツ)_/¯ From 3640867942bdbf2d0a219b7f757ad65eecbcdf96 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 20 Oct 2017 19:30:17 +0200 Subject: [PATCH 16/46] :codacy: Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index b5b274a5..5b6b5960 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -131,7 +131,7 @@ $(document).ready(function() { }); } //call draw() on each table... they don't render properly with scrollX and scrollY set... ¯\_(ツ)_/¯ - $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + $("a[data-toggle=\"tab\"]").on("shown.bs.tab", function (e) { leasetable.draw(); staticleasetable.draw(); }); From 7bd0fb1e56af02da38937ef44810a5e5ccb6d3c9 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Fri, 20 Oct 2017 22:29:53 +0100 Subject: [PATCH 17/46] Sort out system tab. Start sorting out blocklists tab... but it's very broken! Duplicates disabled lists.... Signed-off-by: Adam Warner --- settings.php | 392 +++++++++++++++++++++++++++++---------------------- 1 file changed, 225 insertions(+), 167 deletions(-) diff --git a/settings.php b/settings.php index 72746feb..e51fd9d8 100644 --- a/settings.php +++ b/settings.php @@ -231,19 +231,85 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    + +
    +
    +
    +

    Lists used to generate Pi-hole's Gravity

    +
    +
    + +
    +
    + + + + + + + + + + + + $value) { ?> +
    +
    + + + + + + +
    EnabledListDelete
    +
    + +
    +     		+ + + +
    + +
    +
    + +
    + + + + +
    +
    + +
    +
    +
    -
    +
    -
    +
    @@ -785,78 +851,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - -
    -
    -
    -

    Current status: - - Enabled (recommended) - - Disabled -

    - -

    Note that disabling will render graphs on the web user interface useless

    - -
    -
    -
    - - - - - - - - - - -
    -
    - -
    - -
    -
    -
    - - $value) { ?> -
    -
    - -
    -
    - -
    - -
    - - - - -
    -
    -
    -
    @@ -972,39 +966,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - -
    - -
    -
    - - 
    -                                FTL version: 
-
-                                Process identifier (PID): 
-
-                                Time FTL started: 
-
-                                User / Group: 
-                                / 
-
-                                Total CPU utilization: %
-Memory utilization: %
-Used memory: 
-
    -
    -
    -
    @@ -1064,75 +1025,176 @@ Memory utilization: %
    -
    - +
    +

    Network Information

    +
    + + + + + + + + + + + + + + + + + + + +
    Pi-hole Ethernet Interface:
    Pi-hole IPv4 address:
    Pi-hole IPv6 address:
    Pi-hole hostname
    +
    + -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -

    Warning: PHP - has been - compiled - without IPv6 support.

    -
    -
    - -
    -
    - -
    -
    +
    +
    +
    +

    FTL Information

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FTL version:
    Process identifier (PID):
    Time FTL started:
    User / Group: + /
    Total CPU utilization:%
    Memory utilization: + % +
    Used memory: + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +

    Logging

    +
    +
    +

    Current status: + + Enabled (recommended) + + Disabled +

    + +

    Note that disabling will render graphs on the web user interface useless

    + + +
    +
    + +
    + + +
    + + + + + + + +
    +
    +
    +
    +
    +
    +
    + +

    Danger Zone!


    -

    - -

    -

    +
    + -

    -

    -

    +
    + -

    -

    - -

    +
    +
    @@ -1146,10 +1208,6 @@ Memory utilization: %
    -
    - - -
    From 852f0a733a56c9d9bab79dcaef5933b148620b5a Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 11:24:52 +0200 Subject: [PATCH 18/46] Fix Javascript error that appears when there is no hash part on the URL Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 5b6b5960..23e69545 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -164,8 +164,11 @@ $("button[id^='adlist-btn-']").on("click", function (e) { // Javascript to go to specified tab on save or hyperlink $(function () { - var activeTab = $("[href=" + location.hash + "]"); - activeTab && activeTab.tab("show"); + if(location.hash.length > 0) + { + var activeTab = $("[href=" + location.hash + "]"); + activeTab && activeTab.tab("show"); + } }); // Change hash for save and reload $(".nav-tabs a").on("shown.bs.tab", function (e) { From b70e43f8ba1aeb54a9608e1c72568b09965aa4ae Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 11:52:35 +0200 Subject: [PATCH 19/46] Fix blocking list Javascript Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 15 +++++++++++---- settings.php | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 23e69545..eddacf48 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -152,14 +152,21 @@ $(document).ready(function(){ // Handle list deletion $("button[id^='adlist-btn-']").on("click", function (e) { + var idstring = $(this).context.id; + var id = parseInt(idstring.replace(/[^0-9\.]/g, ''), 10); e.preventDefault(); - var status = $(this).siblings("input[name^='adlist-del-']").is(":checked"); + var status = $("input[id='adlist-del-"+id+"']").is(":checked"); var textType = status ? "none" : "line-through"; + console.log("idstring: "+idstring); + console.log("id: "+id); + console.log("status: "+status); + console.log("textType: "+textType); - $(this).siblings("input[name^='adlist-del-']").prop("checked", !status); - $(this).siblings("input[name^='adlist-enable-']").prop("disabled", !status); - $(this).siblings("a").css("text-decoration", textType); + $("input[name='adlist-del-"+id+"']").prop("checked", !status); + $("input[name='adlist-enable-"+id+"']").prop("disabled", !status); + $("button[id='adlist-btn-"+id+"']").prop("disabled", true); + $("a[id='adlist-text-"+id+"']").css("text-decoration", textType); }); // Javascript to go to specified tab on save or hyperlink diff --git a/settings.php b/settings.php index e51fd9d8..3a3b7394 100644 --- a/settings.php +++ b/settings.php @@ -274,7 +274,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    + target="_new" id="adlist-text-"> Date: Sat, 21 Oct 2017 12:08:00 +0200 Subject: [PATCH 20/46] Improve Javascript (allow toggling of deletion and highlight "Save and Update" button on deletion) and :codacy: Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 22 +++++++++++----------- settings.php | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index eddacf48..3dccbb92 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -152,21 +152,21 @@ $(document).ready(function(){ // Handle list deletion $("button[id^='adlist-btn-']").on("click", function (e) { - var idstring = $(this).context.id; - var id = parseInt(idstring.replace(/[^0-9\.]/g, ''), 10); + var id = parseInt($(this).context.id.replace(/[^0-9\.]/g, ""), 10); e.preventDefault(); - var status = $("input[id='adlist-del-"+id+"']").is(":checked"); + var status = $("input[name=\"adlist-del-"+id+"\"]").is(":checked"); var textType = status ? "none" : "line-through"; - console.log("idstring: "+idstring); - console.log("id: "+id); - console.log("status: "+status); - console.log("textType: "+textType); - $("input[name='adlist-del-"+id+"']").prop("checked", !status); - $("input[name='adlist-enable-"+id+"']").prop("disabled", !status); - $("button[id='adlist-btn-"+id+"']").prop("disabled", true); - $("a[id='adlist-text-"+id+"']").css("text-decoration", textType); + // Check hidden delete box (or reset) + $("input[name=\"adlist-del-"+id+"\"]").prop("checked", !status); + // Untick and disable check box (or reset) + $("input[name=\"adlist-enable-"+id+"\"]").prop("checked", status).prop("disabled", !status); + // Strink through text (or reset) + $("a[id=\"adlist-text-"+id+"\"]").css("text-decoration", textType); + // Highlight that the button has to be clicked in order to make the change live + $("button[id=\"blockinglistsaveupdate\"]").addClass("btn-danger").css("font-weight", "bold"); + }); // Javascript to go to specified tab on save or hyperlink diff --git a/settings.php b/settings.php index 3a3b7394..26338a8a 100644 --- a/settings.php +++ b/settings.php @@ -296,9 +296,9 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - - From 89e4bf890259e72d750f5929791b8ec58510572d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:12:43 +0200 Subject: [PATCH 21/46] Fix layouting in blocking lists tab Signed-off-by: DL6ER --- settings.php | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/settings.php b/settings.php index 26338a8a..1bbdb037 100644 --- a/settings.php +++ b/settings.php @@ -265,25 +265,15 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    - -
    + checked> - + - -
    - +
    @@ -291,17 +281,12 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - +
    - - + +
    From 1f320b0264c8c88d0b1e343941b5e4a220025a5b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:35:04 +0200 Subject: [PATCH 22/46] Add box for API settings Signed-off-by: DL6ER --- settings.php | 107 +++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/settings.php b/settings.php index 1bbdb037..ef99757f 100644 --- a/settings.php +++ b/settings.php @@ -250,7 +250,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - @@ -841,58 +840,64 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -

    Top Lists

    -

    Exclude the following domains from being shown in

    -
    -
    -
    - - +
    +
    +

    API settings

    +
    +
    +

    Top Lists

    +

    Exclude the following domains from being shown in

    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +

    Privacy settings (Statistics / Query Log)

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Privacy mode

    +
    +
    +
    + + + + +
    -
    -
    - - -
    -
    -
    -

    Privacy settings (Statistics / Query Log)

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Privacy mode

    -
    -
    -
    - - - - -
    From 1e1a8ac080335b7a0734cd2972baa296d4dcef51 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:37:26 +0200 Subject: [PATCH 23/46] Add Web interface settings box Signed-off-by: DL6ER --- settings.php | 61 +++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/settings.php b/settings.php index ef99757f..4667c14e 100644 --- a/settings.php +++ b/settings.php @@ -895,6 +895,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { +
    @@ -915,43 +916,35 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - Query Log Page -
    -
    - - -
    -
    -*/ ?> -

    Interface appearance

    -
    -
    -
    -

    CPU Temperature Unit

    -
    -
    +
    +
    +

    Web interface settings

    -
    -
    -
    +
    +

    Interface appearance

    +
    +
    +
    +

    CPU Temperature Unit

    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    - - -
    From 0c70ad5895030a8649d3de4b4ead18f725ecf088 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:40:08 +0200 Subject: [PATCH 24/46] Add Teleporter box Signed-off-by: DL6ER --- settings.php | 90 +++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/settings.php b/settings.php index 4667c14e..c25bab74 100644 --- a/settings.php +++ b/settings.php @@ -953,52 +953,56 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - -
    - -
    -

    Export your Pi-hole lists as downloadable archive

    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - +
    +
    +

    Teleporter

    +
    +
    + + + +
    +

    Export your Pi-hole lists as downloadable archive

    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    -
    -
    -
    - - -

    Upload only Pi-hole backup files.

    - +
    +
    + + +

    Upload only Pi-hole backup files.

    + +
    -
    - - -

    The PHP extension Phar is not loaded. Please ensure it is installed - and loaded - if you want to use the Pi-hole teleporter. - + + +

    The PHP extension Phar is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.

    +
    +
    From 1202ad5335fbd00fdeffb8a976f3e781d22180f8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:45:37 +0200 Subject: [PATCH 25/46] Split Teleporter into two boxes: Export and Import Signed-off-by: DL6ER --- settings.php | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/settings.php b/settings.php index c25bab74..0cc6cd00 100644 --- a/settings.php +++ b/settings.php @@ -952,22 +952,30 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    -
    -
    -

    Teleporter

    -
    -
    - -
    - + + + +
    +
    +
    +

    Teleporter Export

    +
    +

    Export your Pi-hole lists as downloadable archive

    -
    +
    +
    +
    +
    +
    +
    +

    Teleporter Import

    +
    +
    @@ -998,12 +1006,22 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - - -

    The PHP extension Phar is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.

    +
    +
    +
    + + +
    +
    +
    +

    Teleporter

    +
    +
    +

    The PHP extension Phar is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.

    +
    From 9235a6fb20a4ed571987b2a9c1b244b675f99b07 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:46:44 +0200 Subject: [PATCH 26/46] Adjust Teleporter boxes for smaller screens Signed-off-by: DL6ER --- settings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/settings.php b/settings.php index 0cc6cd00..15b829cc 100644 --- a/settings.php +++ b/settings.php @@ -957,7 +957,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { action="scripts/pi-hole/php/teleporter.php" target="_blank" enctype="multipart/form-data"> -
    +

    Teleporter Export

    @@ -970,13 +970,13 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    +

    Teleporter Import

    -
    +
    @@ -996,7 +996,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    +
    From a9e4feb74a668a047b67c3e713ddafaee3993b59 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:51:26 +0200 Subject: [PATCH 27/46] Fix block lists HTML Signed-off-by: DL6ER --- settings.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/settings.php b/settings.php index 15b829cc..48c24c03 100644 --- a/settings.php +++ b/settings.php @@ -242,14 +242,14 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    -
    -

    Lists used to generate Pi-hole's Gravity

    -
    -
    -
    -
    -
    + +
    +
    +
    +
    +

    Lists used to generate Pi-hole's Gravity

    +
    +
    @@ -284,13 +284,14 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { + - + - +
    From be78c38f373a44710be4e55514ace203e9d65e6f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:53:09 +0200 Subject: [PATCH 28/46] Put buttons on block lists tab into a box footer Signed-off-by: DL6ER --- settings.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.php b/settings.php index 48c24c03..f8267f37 100644 --- a/settings.php +++ b/settings.php @@ -265,6 +265,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    @@ -284,7 +285,8 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { - + +
    From d516c63262dd4216ece094afd3f9d72ac32d51c2 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:55:20 +0200 Subject: [PATCH 29/46] Put buttons on API tabs into box footer Signed-off-by: DL6ER --- settings.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.php b/settings.php index f8267f37..9d77bda0 100644 --- a/settings.php +++ b/settings.php @@ -893,12 +893,14 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { checked> Don't show origin of DNS requests in query log + + +
    -
    From 9684c368d575bd831136524f08bd3cf4d2ec69b8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:56:11 +0200 Subject: [PATCH 30/46] Put save button on web interface into box footer Signed-off-by: DL6ER --- settings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings.php b/settings.php index 9d77bda0..72c59e69 100644 --- a/settings.php +++ b/settings.php @@ -947,6 +947,8 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { + +
    From 445569a2bd0981ab2239f9cd90792e0c43876c0f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 12:59:18 +0200 Subject: [PATCH 31/46] Put logging disable/enable/flush buttons on systems tab into box footer Signed-off-by: DL6ER --- settings.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/settings.php b/settings.php index 72c59e69..c38c5a9e 100644 --- a/settings.php +++ b/settings.php @@ -1136,25 +1136,25 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { -
    - -
    -
    -
    -

    Logging

    -
    -
    -

    Current status: +
    +

    +
    +
    +
    +

    Logging

    +
    +
    +

    Current status: + + Enabled (recommended) + + Disabled +

    - Enabled (recommended) - - Disabled -

    - -

    Note that disabling will render graphs on the web user interface useless

    - - - +

    Note that disabling will render graphs on the web user interface useless

    + +
    +
    - +
    -
    +
    From 1ae65f28de79dc3b8a4a167ec4df234e2d9520e1 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 13:05:17 +0200 Subject: [PATCH 32/46] Modify the buttons on the systems tab Signed-off-by: DL6ER --- settings.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/settings.php b/settings.php index c38c5a9e..b1265945 100644 --- a/settings.php +++ b/settings.php @@ -1156,26 +1156,17 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - +
    - + - +
    @@ -1193,7 +1184,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    From 8eddb5abba930721914796e5634650f948d4b410 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 13:09:06 +0200 Subject: [PATCH 33/46] Make system tab rather than the blocking lists tab the first (and default) tab Signed-off-by: DL6ER --- settings.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/settings.php b/settings.php index b1265945..d0310c0a 100644 --- a/settings.php +++ b/settings.php @@ -231,17 +231,17 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    +
    @@ -1032,8 +1032,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    - +
    @@ -1063,12 +1062,9 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    checked> +
    - -
    - % - - Used memory: @@ -1135,7 +1129,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    @@ -1197,8 +1190,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { system
    - - From a2f090571262544c9f3f10af37c4cf40a930d32c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 13:19:14 +0200 Subject: [PATCH 34/46] Combine API and web interface tabs Signed-off-by: DL6ER --- settings.php | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/settings.php b/settings.php index d0310c0a..b606b7e9 100644 --- a/settings.php +++ b/settings.php @@ -235,8 +235,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
  • Block Lists
  • DNS
  • DHCP
    • -
  • API
    • -
  • Web Interface
    • +
  • API / Web interface
  • Teleporter
    • @@ -838,11 +837,20 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - + +
    -
    +

    API settings

    @@ -904,23 +912,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    -
    - -
    - -
    - -
    -
    -
    +

    Web interface settings

    From 1a707a081fbed12f49d35672678b7f3317b5173c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 13:53:34 +0200 Subject: [PATCH 35/46] Rearragne buttons on the system tabs Signed-off-by: DL6ER --- scripts/pi-hole/js/settings.js | 17 ++++++ settings.php | 103 ++++++++++++++++----------------- 2 files changed, 68 insertions(+), 52 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 3dccbb92..e9217ea8 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -84,6 +84,23 @@ $(".confirm-flushlogs").confirm({ dialogClass: "modal-dialog modal-mg" }); +$(".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 your logging?", + title: "Confirmation required", + confirm(button) { + $("#disablelogsform").submit(); + }, + cancel(button) { + // nothing to do + }, + confirmButton: "Yes, disable logs", + cancelButton: "No, go back", + post: true, + confirmButtonClass: "btn-danger", + cancelButtonClass: "btn-success", + dialogClass: "modal-dialog modal-mg" +}); + $(".api-token").confirm({ text: "Make sure that nobody else can scan this code around you. They will have full access to the API without having to know the password. Note that the generation of the QR code will take some time.", title: "Confirmation required", diff --git a/settings.php b/settings.php index b606b7e9..7647016f 100644 --- a/settings.php +++ b/settings.php @@ -1056,6 +1056,19 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    +
    +

    Logging

    +
    +
    +

    Current status: + + Enabled (recommended) + + Disabled +

    +
    +
    - -
    -
    -
    -
    -

    Logging

    -
    -
    -

    Current status: - - Enabled (recommended) - - Disabled -

    - -

    Note that disabling will render graphs on the web user interface useless

    - -
    -
    -
    - -
    - - -
    - - - - - - - -
    -
    -
    -
    -
    -
    -

    Danger Zone!


    -
    - +
    +
    + +
    +
    + + + +
    + + + + +
    + +
    -
    - -
    -
    - +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + + + +
    From 8b61ea5c05beef12b1c1df9ba0f69f4fa75ec456 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 21 Oct 2017 14:33:16 +0200 Subject: [PATCH 36/46] Another small arrangement Signed-off-by: DL6ER --- settings.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/settings.php b/settings.php index 7647016f..2a7ff3dc 100644 --- a/settings.php +++ b/settings.php @@ -1143,7 +1143,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - +
    @@ -1161,9 +1161,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    - +
    -
    + +
    @@ -1163,11 +1164,13 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
    +
    +