From 8b8341ba36bfc7f21b7798b446bcfba98fce584b Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 26 Feb 2022 11:02:13 +0100
Subject: [PATCH] Also hide non-fatal messages in the table

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 api_db.php                     |  6 +++++-
 scripts/pi-hole/js/footer.js   | 25 +++++++++++--------------
 scripts/pi-hole/js/messages.js |  5 ++++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/api_db.php b/api_db.php
index ed84bc03..6f45433a 100644
--- a/api_db.php
+++ b/api_db.php
@@ -399,8 +399,12 @@ if (isset($_GET['status']))
 
 if(isset($_GET["messages"]) && $auth)
 {
+	$extra = ";";
+	if(isset($_GET["ignore"]) && $_GET["ignore"] === 'DNSMASQ_WARN')
+		$extra = "WHERE type != 'DNSMASQ_WARN';";
+
 	$messages = array();
-	$results = $db->query('SELECT * FROM message');
+	$results = $db->query('SELECT * FROM message '.$extra);
 
 	while($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC))
 	{
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index b88862a9..a7fd4612 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -103,23 +103,20 @@ function piholeChange(action, duration) {
 
 function checkMessages() {
   var ignoreNonfatal = localStorage
-    ? localStorage.getItem("hideNonfatalDnsmasqWarnings_chkbox")
+    ? localStorage.getItem("hideNonfatalDnsmasqWarnings_chkbox") === "true"
     : false;
-  $.getJSON(
-    "api_db.php?status" + (ignoreNonfatal === "true" ? "&ignore=DNSMASQ_WARN" : ""),
-    function (data) {
-      if ("message_count" in data && data.message_count > 0) {
-        var title =
-          data.message_count > 1
-            ? "There are " + data.message_count + " warnings. Click for further details."
-            : "There is one warning. Click for further details.";
+  $.getJSON("api_db.php?status" + (ignoreNonfatal ? "&ignore=DNSMASQ_WARN" : ""), function (data) {
+    if ("message_count" in data && data.message_count > 0) {
+      var title =
+        data.message_count > 1
+          ? "There are " + data.message_count + " warnings. Click for further details."
+          : "There is one warning. Click for further details.";
 
-        $("#pihole-diagnosis").prop("title", title);
-        $("#pihole-diagnosis-count").text(data.message_count);
-        $("#pihole-diagnosis").removeClass("hidden");
-      }
+      $("#pihole-diagnosis").prop("title", title);
+      $("#pihole-diagnosis-count").text(data.message_count);
+      $("#pihole-diagnosis").removeClass("hidden");
     }
-  );
+  });
 }
 
 function testCookies() {
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index f95777f6..37c13b01 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -132,9 +132,12 @@ function renderMessage(data, type, row) {
 }
 
 $(function () {
+  var ignoreNonfatal = localStorage
+    ? localStorage.getItem("hideNonfatalDnsmasqWarnings_chkbox") === "true"
+    : false;
   table = $("#messagesTable").DataTable({
     ajax: {
-      url: "api_db.php?messages",
+      url: "api_db.php?messages" + (ignoreNonfatal ? "&ignore=DNSMASQ_WARN" : ""),
       data: { token: token },
       type: "POST",
       dataSrc: "messages",