From d6bf4293bf850206a0247ebfacea1b2f9c297f98 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 28 Jul 2023 23:48:40 +0200
Subject: [PATCH 1/2] Show direct link to domainlist on REGEX blocked entries

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index a2c5a430..36b43a99 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -111,7 +111,7 @@ function parseQueryStatus(data) {
       colorClass = "text-red";
       icon = "fa-solid fa-ban";
       fieldtext = "Blocked (regex)";
-      regexLink = data.regex > 0;
+      regexLink = data.regex_id > 0;
       buttontext =
         '<button type="button" class="btn btn-default btn-sm text-green btn-whitelist"><i class="fas fa-check"></i> Allow</button>';
       break;
@@ -152,7 +152,7 @@ function parseQueryStatus(data) {
       colorClass = "text-red";
       icon = "fa-solid fa-ban";
       fieldtext = "Blocked (regex diened, CNAME)";
-      regexLink = data.regex > 0;
+      regexLink = data.regex_id > 0;
       buttontext =
         '<button type="button" class="btn btn-default btn-sm text-green btn-whitelist"><i class="fas fa-check"></i> Allow</button>';
       isCNAME = true;
@@ -250,12 +250,12 @@ function formatInfo(data) {
     cnameInfo = "";
   if (queryStatus.regexLink) {
     var regexLink =
-      '<a href="groups-domains.php?domainid=' +
-      data.regex +
-      'target="_blank">Regex ID ' +
-      data.regex +
+      '<a href="groups/domains?domainid=' +
+      data.regex_id +
+      '" target="_blank">Regex ID ' +
+      data.regex_id +
       "</a>";
-    regexInfo = divStart + "Query was blocked by:</td><td>" + regexLink + "</div>";
+    regexInfo = divStart + "Query was blocked by: </td><td>" + regexLink + "</div>";
   }
 
   if (queryStatus.isCNAME) {

From 1613115063b392155e5ff93ebf10b129d891aaa6 Mon Sep 17 00:00:00 2001
From: DL6ER <DL6ER@users.noreply.github.com>
Date: Thu, 3 Aug 2023 09:30:56 +0200
Subject: [PATCH 2/2] Update scripts/pi-hole/js/queries.js

Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
---
 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 36b43a99..1b95f8e4 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -151,7 +151,7 @@ function parseQueryStatus(data) {
     case "REGEX_CNAME":
       colorClass = "text-red";
       icon = "fa-solid fa-ban";
-      fieldtext = "Blocked (regex diened, CNAME)";
+      fieldtext = "Blocked (regex denied, CNAME)";
       regexLink = data.regex_id > 0;
       buttontext =
         '<button type="button" class="btn btn-default btn-sm text-green btn-whitelist"><i class="fas fa-check"></i> Allow</button>';