From edb93db3ce3e38d2cd16d037ac5002324e10388f Mon Sep 17 00:00:00 2001 From: mcattle <7505674+mcattle@users.noreply.github.com> Date: Thu, 16 Nov 2017 23:08:35 -0700 Subject: [PATCH 01/10] Add Quad9 DNS Servers to DNS Servers List I've added the Quad9 DNS servers (IPv4 and IPv6) to the DNS Servers list. (https://www.quad9.net/) I've opted not to also add their non-secure alternate servers, as those mainly exist for diagnostics of false positives, and are not the primary focus of the Quad9 service. They do not offer secondary servers, as their primary servers are already geographically distributed and redundant. --- scripts/pi-hole/php/savesettings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index da339526..a5601896 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -122,7 +122,8 @@ function isinserverlist($addr) { "Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"], "Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"], "Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"], - "DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"] + "DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"], + "Quad9" => ["v4_1" => "9.9.9.9", "v6_1" => "2620:fe::fe"] ]; $adlist = []; From 6e6151c9cd3b2c4892f7a0a603e49b658809025e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 4 Dec 2017 21:50:14 +0100 Subject: [PATCH 02/10] Adding branch/version display for FTL Signed-off-by: DL6ER --- scripts/pi-hole/php/footer.php | 1 + scripts/pi-hole/php/update_checker.php | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index d9ca6cec..4a353832 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -59,6 +59,7 @@ if($web_update){ ?> (Update available!) FTL Version (Update available!)
Donate if you found this useful.
diff --git a/scripts/pi-hole/php/update_checker.php b/scripts/pi-hole/php/update_checker.php index e7ab480d..9bd4ab06 100644 --- a/scripts/pi-hole/php/update_checker.php +++ b/scripts/pi-hole/php/update_checker.php @@ -42,8 +42,15 @@ else $web_current = explode("-",$versions[1])[0]; } - /********** Get Pi-hole FTL version (not a git repository) **********/ - $FTL_current = $versions[2]; + /********** Get Pi-hole FTL (not a git repository) **********/ + $FTL_branch = $branches[2]; + if($FTL_branch !== "master") { + $FTL_current = "vDev"; + $FTL_commit = $versions[2]; + } + else { + $FTL_current = explode("-",$versions[2])[0]; + } // Get data from GitHub $core_latest = $GitHubversions[0]; @@ -77,7 +84,15 @@ else // FTL version comparison // This logic allows the local core version to be newer than the upstream version // The update indicator is only shown if the upstream version is NEWER - $FTL_update = (version_compare($FTL_current, $FTL_latest) < 0); + if($FTL_current !== "vDev") + { + $FTL_update = (version_compare($FTL_current, $FTL_latest) < 0); + } + else + { + $FTL_update = false; + } + } ?> From f5f4e57454bf03c10e04c143cbe3f0bb506723da Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 4 Dec 2017 21:51:44 +0100 Subject: [PATCH 03/10] Also hide the long details if only the FTL branch is set Signed-off-by: DL6ER --- scripts/pi-hole/php/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index 4a353832..43cc2041 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -48,7 +48,7 @@