From c115d1da7a023de323e8e4a4cbc966601faf30a4 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 23 May 2023 20:32:51 +0200
Subject: [PATCH] Blocking status changed from boolean to string-enum to
 support "failure" as DNS status

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/footer.js   | 49 +++++++++++++++++++++++++---------
 scripts/pi-hole/lua/sidebar.lp |  2 +-
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index 94cfc82a..4d372606 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -25,15 +25,39 @@ function piholeChanged(blocking) {
   var ena = $("#pihole-enable");
   var dis = $("#pihole-disable");
 
-  if (blocking) {
-    status.html("<i class='fa fa-circle fa-fw text-green-light'></i>&nbsp;Active");
-    ena.hide();
-    dis.show();
-    dis.removeClass("active");
-  } else {
-    status.html("<i class='fa fa-circle fa-fw text-red'></i>&nbsp;Blocking disabled");
-    ena.show();
-    dis.hide();
+  switch (blocking) {
+    case "enabled": {
+      status.html("<i class='fa fa-circle fa-fw text-green-light'></i>&nbsp;Active");
+      ena.hide();
+      dis.show();
+      dis.removeClass("active");
+
+      break;
+    }
+
+    case "disabled": {
+      status.html("<i class='fa fa-circle fa-fw text-red'></i>&nbsp;Blocking disabled");
+      ena.show();
+      dis.hide();
+
+      break;
+    }
+
+    case "failure": {
+      status.html(
+        "<i class='fa-solid fa-triangle-exclamation fa-fw text-red'></i>&nbsp;<span class='text-red'>DNS server failure</span>"
+      );
+      ena.hide();
+      dis.hide();
+
+      break;
+    }
+
+    default: {
+      status.html("<i class='fa fa-circle fa-fw text-red'></i>&nbsp;Status unknown");
+      ena.hide();
+      dis.hide();
+    }
   }
 }
 
@@ -92,19 +116,18 @@ function piholeChange(action, duration) {
   }
 
   btnStatus.html("<i class='fa fa-spinner fa-spin'> </i>");
-  const blocking = action === "enable";
   $.ajax({
     url: "/api/dns/blocking",
     method: "POST",
     data: JSON.stringify({
-      blocking: blocking,
+      blocking: action === "enable",
       timer: parseInt(duration, 10) > 0 ? parseInt(duration, 10) : null,
     }),
   })
     .done(function (data) {
-      if (data.blocking === blocking) {
+      if (data.blocking === action + "d") {
         btnStatus.html("");
-        piholeChanged(blocking);
+        piholeChanged(data.blocking);
         if (duration > 0) {
           enaT.html(Date.now() + duration * 1000);
           setTimeout(countDown, 100);
diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/pi-hole/lua/sidebar.lp
index 0798a3ce..016ba5cd 100644
--- a/scripts/pi-hole/lua/sidebar.lp
+++ b/scripts/pi-hole/lua/sidebar.lp
@@ -118,7 +118,7 @@
                 <li id="pihole-enable" class="menu-dns treeview" style="display: none;">
                     <a href="#">
                         <i class="fa fa-fw menu-icon fa-play"></i>
-                        <span id="enableLabel" class="text-green">Enable Blocking&nbsp;&nbsp;&nbsp;
+                        <span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp;
                             <span id="flip-status-enable"></span>
                         </span>
                     </a>