diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 4eee5c20..0edae1bc 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -186,17 +186,9 @@ $("button[id^='adlist-btn-']").on("click", function (e) { }); -// Javascript to go to specified tab on save or hyperlink -$(function () { - if(location.hash.length > 0) - { - var activeTab = $("[href=" + location.hash + "]"); - activeTab && activeTab.tab("show"); - } -}); -// Change hash for save and reload +// Change "?tab=" parameter in URL for save and reload $(".nav-tabs a").on("shown.bs.tab", function (e) { - window.location.hash = e.target.hash; + window.history.pushState("", "", "?tab=" + e.target.hash.substring(1)); window.scrollTo(0, 0); }); diff --git a/settings.php b/settings.php index c6ba7a17..17235cbd 100644 --- a/settings.php +++ b/settings.php @@ -227,20 +227,27 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { ?> +
-
+
in active">
@@ -249,35 +256,35 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

Lists used to generate Pi-hole's Gravity

- - - - - - - - - - $value) { ?> -
-
- - - - - - - -
EnabledListDelete
- checked> - - - - - -
+
+ + + + + + + + + + $value) { ?> + + + + + + + +
EnabledListDelete
+ checked> + + + + + +
+
@@ -294,7 +301,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
in active">
-
- -
-
-
-

DHCP Settings

+
+ +
+
+
+

DHCP Settings

+
+
+
+
+
+
+ +
+
+

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

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

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

-
+
+ +
+
+
+

Advanced DHCP settings

-
-
- -
-
-
-
-
From
- disabled> +
+
+
+ +
+
+
Domain
+ disabled> +
-
-
-
-
To
- disabled> +
+
+ +
+
+
Lease time in hours
+ disabled> +
+

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

-
-
-
- -
-
-
Router
- disabled> +
+
+
+
+ +
@@ -411,233 +470,177 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
- -
-
-
-

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"; + 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]); } - - $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
- -
-
-
-
- - - - - - - - - - - - + readStaticLeasesFile(); + ?> +
+
+
+

DHCP leases

+
+
+
+
+ +
MAC addressIP addressHostname
+ + + + + + + + + + +
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.

+ MAC address + IP address + Hostname + + + + + + + + + + 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.

+
+ + +
- - - -
-
- +
-
+
in active">
-
+

Upstream DNS Servers

-
+
@@ -645,55 +648,54 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { $value) { ?> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
IPv4Name
">" - value="true" - checked > - ">" - value="true" - checked > - ">" - value="true" - checked disabled > - ">" - value="true" - checked disabled > -
"> + " value="true" + checked> + "> + " value="true" + checked> + "> + " value="true" + checked disabled > + "> + " value="true" + checked disabled > +
-
+
-
checked> +
+ checked>
-
checked> +
+ checked>
-
checked> +
+ checked>
-
checked> +
+ checked>
-
+

Interface listening behavior

@@ -749,30 +748,29 @@ 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.

+ 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.

@@ -789,43 +787,35 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
+ +
-
+
+ +

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

+ 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.

+ 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.

@@ -847,9 +837,9 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { } // Use $boxedlayout value determined in header.php ?> -
+
in active">
-
+
@@ -863,22 +853,22 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
- +
-
+
- +
@@ -890,17 +880,20 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
+ +
-
+
+ +
@@ -908,10 +901,11 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

Privacy mode

-
+
+ +
@@ -925,7 +919,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
@@ -936,21 +930,28 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

Interface appearance

-
+
+ +

CPU Temperature Unit

-
+
+
-
+
+
-
+
+
@@ -967,7 +968,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
in active">
-
+
in active">
@@ -1102,41 +1103,36 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
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: +
@@ -1177,20 +1173,16 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
- +
- +
- +
@@ -1210,7 +1202,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-