From eaf068c5063bd1087ce4d4a4c26113745055592e Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 8 Oct 2023 19:35:02 +0200
Subject: [PATCH 1/3] Show HTTPS hint on login page only when HTTPS is actually
 served. If it is served an a port != 443, add this port as well

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 login.lp                    |  4 ++--
 scripts/pi-hole/js/login.js | 28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/login.lp b/login.lp
index 8d4b4bda..30e002b1 100644
--- a/login.lp
+++ b/login.lp
@@ -26,8 +26,8 @@ mg.include('scripts/pi-hole/lua/header.lp','r')
                 <div class="text-center form-group has-error" id="dns-failure-label" style="display: none;">
                     <label>DNS Server failure detected, log in to see Pi-hole diagnosis messages</label>
                 </div>
-                <div class="text-center form-group has-error" id="dns-failure-label" style="display: <? if is_secure then ?>none<? else ?>block<? end ?>;">
-                    <div class="box box-danger" id="insecure-box">
+                <div class="text-center form-group has-error" id="insecure-box" style="display: none;">
+                    <div class="box box-danger">
                         <div class="box-header with-border pointer no-user-select">
                             <h3 class="box-title has-error control-label"><i class="fa fa-fw fa-triangle-exclamation"></i>&nbsp;&nbsp;Insecure network connection&nbsp;&nbsp;<i class="fa fa-fw fa-triangle-exclamation"></i></h3>
                         </div>
diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js
index b394dd95..247cb6d3 100644
--- a/scripts/pi-hole/js/login.js
+++ b/scripts/pi-hole/js/login.js
@@ -109,18 +109,24 @@ $(function () {
   // Check if we need to login at all
   $.ajax({
     url: "/api/auth",
-  }).done(function (data) {
-    if (data.session.valid === true) redirect();
-    if (data.session.totp === true) $("#totp_input").removeClass("hidden");
-    if (data.dns === false) showDNSfailure();
-  });
+  })
+    .done(function (data) {
+      if (data.session.valid === true) redirect();
+      if (data.session.totp === true) $("#totp_input").removeClass("hidden");
+      if (data.dns === false) showDNSfailure();
+    })
+    .always(function (data) {
+      // Generate HTTPS redirection link (only used if not already HTTPS)
+      if (location.protocol !== "https:" && data.responseJSON.https_port !== 0) {
+        let url = "https://" + location.hostname;
+        if (data.responseJSON.https_port !== 443) url += ":" + data.responseJSON.https_port;
+        url += location.pathname + location.search + location.hash;
+
+        $("#https-link").attr("href", url);
+        $("#insecure-box").show();
+      }
+    });
 
   // Clear TOTP field
   $("#totp").val("");
-
-  // Generate HTTPS redirection link (only used if not already HTTPS)
-  if (location.protocol !== "https:") {
-    const url = "https:" + location.href.substring(location.protocol.length);
-    $("#https-link").attr("href", url);
-  }
 });

From a5a7a4e481cadae3c504d92a2a00338b97cae221 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 8 Oct 2023 22:59:06 +0200
Subject: [PATCH 2/3] Adapt to most recent FTL changes

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/login.js | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js
index 247cb6d3..03449508 100644
--- a/scripts/pi-hole/js/login.js
+++ b/scripts/pi-hole/js/login.js
@@ -109,23 +109,27 @@ $(function () {
   // Check if we need to login at all
   $.ajax({
     url: "/api/auth",
-  })
-    .done(function (data) {
-      if (data.session.valid === true) redirect();
-      if (data.session.totp === true) $("#totp_input").removeClass("hidden");
-      if (data.dns === false) showDNSfailure();
-    })
-    .always(function (data) {
-      // Generate HTTPS redirection link (only used if not already HTTPS)
-      if (location.protocol !== "https:" && data.responseJSON.https_port !== 0) {
-        let url = "https://" + location.hostname;
-        if (data.responseJSON.https_port !== 443) url += ":" + data.responseJSON.https_port;
-        url += location.pathname + location.search + location.hash;
+  }).done(function (data) {
+    if (data.session.valid === true) redirect();
+    if (data.session.totp === true) $("#totp_input").removeClass("hidden");
+  });
 
-        $("#https-link").attr("href", url);
-        $("#insecure-box").show();
-      }
-    });
+  // Get imformation about HTTPS port and DNS status
+  $.ajax({
+    url: "/api/info/login",
+  }).done(function (data) {
+    if (data.dns === false) showDNSfailure();
+
+    // Generate HTTPS redirection link (only used if not already HTTPS)
+    if (location.protocol !== "https:" && data.https_port !== 0) {
+      let url = "https://" + location.hostname;
+      if (data.https_port !== 443) url += ":" + data.https_port;
+      url += location.pathname + location.search + location.hash;
+
+      $("#https-link").attr("href", url);
+      $("#insecure-box").show();
+    }
+  });
 
   // Clear TOTP field
   $("#totp").val("");

From e01124fb2be59372d06f3e8acde5781fefa9783d Mon Sep 17 00:00:00 2001
From: DL6ER <DL6ER@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:38:11 +0200
Subject: [PATCH 3/3] Update scripts/pi-hole/js/login.js

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
---
 scripts/pi-hole/js/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js
index 03449508..3f402841 100644
--- a/scripts/pi-hole/js/login.js
+++ b/scripts/pi-hole/js/login.js
@@ -114,7 +114,7 @@ $(function () {
     if (data.session.totp === true) $("#totp_input").removeClass("hidden");
   });
 
-  // Get imformation about HTTPS port and DNS status
+  // Get information about HTTPS port and DNS status
   $.ajax({
     url: "/api/info/login",
   }).done(function (data) {