diff --git a/auditlog.php b/auditlog.php index cb3db9af..86ebb685 100644 --- a/auditlog.php +++ b/auditlog.php @@ -82,8 +82,9 @@ + + + - - diff --git a/db_graph.php b/db_graph.php index 2642bf14..6bc207eb 100644 --- a/db_graph.php +++ b/db_graph.php @@ -62,10 +62,10 @@ $token = $_SESSION['token']; - - + + diff --git a/db_lists.php b/db_lists.php index c0e39408..64517548 100644 --- a/db_lists.php +++ b/db_lists.php @@ -138,10 +138,10 @@ else - - + + diff --git a/db_queries.php b/db_queries.php index ddb633f2..635d87ae 100644 --- a/db_queries.php +++ b/db_queries.php @@ -176,11 +176,10 @@ $token = $_SESSION['token']; + + + - - - - diff --git a/debug.php b/debug.php index 20ffa7c8..9840331f 100644 --- a/debug.php +++ b/debug.php @@ -17,9 +17,8 @@ + + - - - diff --git a/gravity.php b/gravity.php index 1b1bd3bb..d86be424 100644 --- a/gravity.php +++ b/gravity.php @@ -25,9 +25,8 @@ + + - - - diff --git a/index.php b/index.php index b2a66a4b..e090a445 100644 --- a/index.php +++ b/index.php @@ -348,8 +348,9 @@ else + + + - - diff --git a/list.php b/list.php index da0a373c..75b14a92 100644 --- a/list.php +++ b/list.php @@ -75,8 +75,8 @@ function getFullName() { + + - - diff --git a/queries.php b/queries.php index 8e7133d0..51c543e6 100644 --- a/queries.php +++ b/queries.php @@ -165,9 +165,9 @@ if(strlen($showing) > 0) + + + - - - diff --git a/queryads.php b/queryads.php index 0fe5850c..3c14765b 100644 --- a/queryads.php +++ b/queryads.php @@ -23,9 +23,8 @@ + + - - - diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js index 8da24ad6..99436b7f 100644 --- a/scripts/pi-hole/js/db_graph.js +++ b/scripts/pi-hole/js/db_graph.js @@ -21,6 +21,7 @@ $(function () { { timePicker: true, timePickerIncrement: 15, locale: { format: "MMMM Do YYYY, HH:mm" }, + startDate: start__, endDate: end__, ranges: { "Today": [moment().startOf("day"), moment()], "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")], diff --git a/scripts/pi-hole/js/db_lists.js b/scripts/pi-hole/js/db_lists.js index e867b6bc..735d4384 100644 --- a/scripts/pi-hole/js/db_lists.js +++ b/scripts/pi-hole/js/db_lists.js @@ -22,6 +22,7 @@ $(function () { { timePicker: true, timePickerIncrement: 15, locale: { format: "MMMM Do YYYY, HH:mm" }, + startDate: start__, endDate: end__, ranges: { "Today": [moment().startOf("day"), moment()], "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")], diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js index f50d9802..b38356ae 100644 --- a/scripts/pi-hole/js/db_queries.js +++ b/scripts/pi-hole/js/db_queries.js @@ -36,6 +36,7 @@ $(function () { { timePicker: true, timePickerIncrement: 15, locale: { format: "MMMM Do YYYY, HH:mm" }, + startDate: start__, endDate: end__, ranges: { "Today": [moment().startOf("day"), moment()], "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")], diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index dafa4ac3..f36e76e1 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -170,7 +170,7 @@ $(document).ready(function() { dnssec_status = "
ABANDONED"; break; case "5": - dnssec_status = "
?"; + dnssec_status = "
UNKNOWN"; break; default: // No DNSSEC dnssec_status = ""; diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index 43cc2041..06687e99 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index ed5bf0ba..c4c99e71 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -220,6 +220,16 @@ if($auth) { } ?> + + + + + + + + + + diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index fd15be78..9a0f5d11 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -558,6 +558,11 @@ function readAdlists() $error .= "Static release for MAC address (".htmlspecialchars($mac).") already defined!
"; break; } + if($ip !== "noip" && $lease["IP"] === $ip) + { + $error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!
"; + break; + } } if(!strlen($error)) @@ -635,9 +640,18 @@ function readAdlists() $type = "(IPv4)"; } + if(isset($_POST["DHCP_rapid_commit"])) + { + $rapidcommit = "true"; + } + else + { + $rapidcommit = "false"; + } + if(!strlen($error)) { - exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6); + exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6." ".$rapidcommit); $success .= "The DHCP server has been activated ".htmlspecialchars($type); } } diff --git a/settings.php b/settings.php index 73061e38..fca9a3cd 100644 --- a/settings.php +++ b/settings.php @@ -340,6 +340,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" } else { $DHCPIPv6 = false; } + if (isset($setupVars["DHCP_rapid_commit"])) { + $DHCP_rapid_commit = $setupVars["DHCP_rapid_commit"]; + } else { + $DHCP_rapid_commit = false; + } } else { $DHCP = false; @@ -356,6 +361,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" } $DHCPleasetime = 24; $DHCPIPv6 = false; + $DHCP_rapid_commit = false; } if (isset($setupVars["PIHOLE_DOMAIN"])) { $piHoleDomain = $setupVars["PIHOLE_DOMAIN"]; @@ -475,6 +481,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" ?>>Enable IPv6 support (SLAAC + RA) +
+
+ +
+
@@ -1369,11 +1383,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" - - + + diff --git a/taillog-FTL.php b/taillog-FTL.php index 53b454ad..fd40f223 100644 --- a/taillog-FTL.php +++ b/taillog-FTL.php @@ -16,9 +16,8 @@ 

 

 
+
+
 
-
-
-
diff --git a/taillog.php b/taillog.php
index 895cba56..a03c45dc 100644
--- a/taillog.php
+++ b/taillog.php
@@ -16,9 +16,8 @@
 

 

 
+
+
 
-
-
-