From a10f23b79a5665f2d28445c50fc5157ed669b062 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 15 Jan 2019 17:17:34 +0100 Subject: [PATCH 1/4] Prevent multiple static DHCP entries for the same IP address to get added. Fixes #889 Signed-off-by: DL6ER --- scripts/pi-hole/php/savesettings.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index a684038e..721c9430 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 release for IP address (".htmlspecialchars($ip).") already defined!
"; + break; + } } if(!strlen($error)) From 991be959d32c66291eb992e4c068d5001bfb84d2 Mon Sep 17 00:00:00 2001 From: Mark Drobnak Date: Sat, 19 Jan 2019 22:32:25 +0100 Subject: [PATCH 2/4] Update scripts/pi-hole/php/savesettings.php Co-Authored-By: DL6ER Signed-off-by: DL6ER --- 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 721c9430..9a0f5d11 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -560,7 +560,7 @@ function readAdlists() } if($ip !== "noip" && $lease["IP"] === $ip) { - $error .= "Static release for IP address (".htmlspecialchars($ip).") already defined!
"; + $error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!
"; break; } } From 8ae36a0dcb266e05f9b5240e905c7b1dd9e66b70 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 20 Jan 2019 11:36:39 +0100 Subject: [PATCH 3/4] Fill daterange field with initialization (now-6d -> now) Signed-off-by: DL6ER --- scripts/pi-hole/js/db_graph.js | 1 + scripts/pi-hole/js/db_lists.js | 1 + scripts/pi-hole/js/db_queries.js | 1 + 3 files changed, 3 insertions(+) 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")], From f19a538e7fc79fbd212ef1f4663332033d04f248 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sat, 26 Jan 2019 13:11:08 -0800 Subject: [PATCH 4/4] Clarify wording of DNSSEC Unknown status Previously, unknown DNSSEC status was marked with a question mark. FTL loads queries from the database and sets the DNSSEC status to unknown, because that information is not stored in the database: https://github.com/pi-hole/FTL/pull/461 Signed-off-by: Mcat12 --- 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 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 = "";