From e5ce53446c228032fc9e4aaf8efdb044cfeb031a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 7 Sep 2022 21:43:28 +0200
Subject: [PATCH 01/12] Do not apply IDNA conversion to regex domains
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/php/groups.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php
index 8ba2552d6..5a12138e5 100644
--- a/scripts/pi-hole/php/groups.php
+++ b/scripts/pi-hole/php/groups.php
@@ -596,14 +596,15 @@ function verify_ID_array($arr)
                 continue;
             }
 
-            $input = $domain;
-            // Convert domain name to IDNA ASCII form for international domains
-            // Skip this for the root zone `.`
-            if ($domain != '.') {
-                $domain = convertUnicodeToIDNA($domain);
-            }
             if ($_POST['type'] != '2' && $_POST['type'] != '3') {
-                // If not adding a RegEx, we convert the domain lower case and check whether it is valid
+                // If not adding a RegEx....
+                $input = $domain;
+                // Convert domain name to IDNA ASCII form for international domains
+                // Skip this for the root zone `.`
+                if ($domain != '.') {
+                    $domain = convertUnicodeToIDNA($domain);
+                }
+                // convert the domain lower case and check whether it is valid
                 $domain = strtolower($domain);
                 $msg = '';
                 if (!validDomain($domain, $msg)) {

From b75ec4530cf74eb523f75208751bc40bc689e061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Thu, 1 Sep 2022 09:03:15 +0200
Subject: [PATCH 02/12] Add interpretation for Pi-hole message type ADLIST
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/groups-adlists.js | 25 +++++++++++++++++++++++++
 scripts/pi-hole/js/messages.js       | 13 +++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index 452c6aedf..e8e9cb2c5 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -10,6 +10,7 @@
 var table;
 var groups = [];
 var token = $("#token").text();
+var GETDict = {};
 
 function getGroups() {
   $.post(
@@ -24,6 +25,13 @@ function getGroups() {
 }
 
 $(function () {
+  window.location.search
+    .substr(1)
+    .split("&")
+    .forEach(function (item) {
+      GETDict[item.split("=")[0]] = item.split("=")[1];
+    });
+
   $("#btnAdd").on("click", addAdlist);
 
   utils.setBsSelectDefaults();
@@ -289,6 +297,11 @@ function initTable() {
 
       var applyBtn = "#btn_apply_" + data.id;
 
+      // Highlight row (if url parameter "adlistid=" is used)
+      if ("adlistid" in GETDict && data.id === parseInt(GETDict.adlistid, 10)) {
+        $(row).find("td").addClass("highlight");
+      }
+
       var button =
         '<button type="button" class="btn btn-danger btn-xs" id="deleteAdlist_' +
         data.id +
@@ -371,6 +384,18 @@ function initTable() {
       // Apply loaded state to table
       return data;
     },
+    initComplete: function () {
+      if ("adlistid" in GETDict) {
+        var pos = table
+          .column(0, { order: "current" })
+          .data()
+          .indexOf(parseInt(GETDict.adlistid, 10));
+        if (pos >= 0) {
+          var page = Math.floor(pos / table.page.info().length);
+          table.page(page).draw(false);
+        }
+      }
+    },
   });
 
   table.on("init select deselect", function () {
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index b3d8827a6..b0d99afe7 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -126,6 +126,19 @@ function renderMessage(data, type, row) {
         "</pre>"
       );
 
+    case "ADLIST":
+      return (
+        '<a href="groups-adlists.php?adlistid=' +
+        row.blob1 +
+        '">' +
+        "Adlist with ID " +
+        parseInt(row.blob1, 10) +
+        "</a> was inaccessible during last gravity run." +
+        "<pre>" +
+        utils.escapeHtml(row.message) +
+        "</pre>"
+      );
+
     default:
       return "Unknown message type<pre>" + JSON.stringify(row) + "</pre>";
   }

From dff293902a64b4593677349f1fdd0a8d9e6c6b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Thu, 8 Sep 2022 11:31:15 +0200
Subject: [PATCH 03/12] Guard database data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index b0d99afe7..a480d550c 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -129,7 +129,7 @@ function renderMessage(data, type, row) {
     case "ADLIST":
       return (
         '<a href="groups-adlists.php?adlistid=' +
-        row.blob1 +
+        parseInt(row.blob1, 10) +
         '">' +
         "Adlist with ID " +
         parseInt(row.blob1, 10) +

From c01361849286ea530064e98a3e6bc4276d7b4249 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 8 Sep 2022 14:56:43 +0200
Subject: [PATCH 04/12] Set Samesite=Strict for PHP session cookie. The cookie
 is set manually to be backwards compatible with versions below PHP7.3

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/auth.php     | 15 ++-------------
 scripts/pi-hole/php/func.php     | 16 ++++++++++++++++
 scripts/pi-hole/php/password.php |  7 +------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
index 2c532c5f3..59a4389aa 100644
--- a/scripts/pi-hole/php/auth.php
+++ b/scripts/pi-hole/php/auth.php
@@ -100,19 +100,8 @@ function check_cors()
 
 function check_csrf($token)
 {
-    // Check CSRF token
-    $session_started = function_exists('session_status') ?
-        session_status() == PHP_SESSION_ACTIVE :
-        session_id() == '';
-
-    if (!$session_started) {
-        // Start a new PHP session (or continue an existing one)
-        // Prevents javascript XSS attacks aimed to steal the session ID
-        ini_set('session.cookie_httponly', 1);
-        // Prevent Session ID from being passed through URLs
-        ini_set('session.use_only_cookies', 1);
-        session_start();
-    }
+    // Start a new PHP session (or continue an existing one)
+    start_php_session();
 
     if (!isset($_SESSION['token'])) {
         log_and_die('Session expired! Please re-login on the Pi-hole dashboard.');
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index 76a19cd8b..ce2e28243 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -653,3 +653,19 @@ function convertseconds($argument)
 
     return sprintf('%dd %dh %dm %ds', $seconds / 86400, $seconds / 3600 % 24, $seconds / 60 % 60, $seconds % 60);
 }
+
+function start_php_session()
+{
+    // Prevent Session ID from being passed through URLs
+    ini_set('session.use_only_cookies', 1);
+    session_start();
+    // HttpOnly: Prevents javascript XSS attacks aimed to steal the session ID
+    //
+    // SameSite=Strict: Allows servers to assert that a cookie ought not to be
+    // sent along with cross-site requests. This assertion allows user agents to
+    // mitigate the risk of cross-origin information leakage, and provides some
+    // protection against cross-site request forgery attacks.
+    // Direct support of Samesite has been added to PHP only in version 7.3
+    // We manually set the cookie option ourselves to ensure backwards compatibility
+    header('Set-Cookie: PHPSESSID= '.session_id().'; path=/; HttpOnly; SameSite=Strict');
+}
diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index b2f014fbb..7724cd053 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -9,13 +9,8 @@
 
 require_once 'func.php';
 
-// Prevents javascript XSS attacks aimed to steal the session ID
-ini_set('session.cookie_httponly', 1);
-// Prevent Session ID from being passed through URLs
-ini_set('session.use_only_cookies', 1);
-
 // Start a new PHP session (or continue an existing one)
-session_start();
+start_php_session();
 
 // Read setupVars.conf file
 $setupVars = parse_ini_file('/etc/pihole/setupVars.conf');

From d12ef014e598f896292ee2c10fd54f476160b637 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Thu, 8 Sep 2022 23:47:09 -0300
Subject: [PATCH 05/12] Use constants in place of class constants

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 api.php                            |  8 ++++----
 scripts/pi-hole/php/database.php   | 16 ++++++----------
 scripts/pi-hole/php/groups.php     |  6 +++---
 scripts/pi-hole/php/teleporter.php | 14 +++++++-------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/api.php b/api.php
index 3801561f8..4caecfecd 100644
--- a/api.php
+++ b/api.php
@@ -86,22 +86,22 @@
 
     switch ($_GET['list']) {
         case 'black':
-            $_POST['type'] = ListType::blacklist;
+            $_POST['type'] = LISTTYPE_BLACKLIST;
 
             break;
 
         case 'regex_black':
-            $_POST['type'] = ListType::regex_blacklist;
+            $_POST['type'] = LISTTYPE_REGEX_BLACKLIST;
 
             break;
 
         case 'white':
-            $_POST['type'] = ListType::whitelist;
+            $_POST['type'] = LISTTYPE_WHITELIST;
 
             break;
 
         case 'regex_white':
-            $_POST['type'] = ListType::regex_whitelist;
+            $_POST['type'] = LISTTYPE_REGEX_WHITELIST;
 
             break;
 
diff --git a/scripts/pi-hole/php/database.php b/scripts/pi-hole/php/database.php
index f3fe34874..f52c61698 100644
--- a/scripts/pi-hole/php/database.php
+++ b/scripts/pi-hole/php/database.php
@@ -7,6 +7,12 @@
 *    Please see LICENSE file for your rights under this license
 */
 
+// List Type Constants
+const LISTTYPE_WHITELIST = 0;
+const LISTTYPE_BLACKLIST = 1;
+const LISTTYPE_REGEX_WHITELIST = 2;
+const LISTTYPE_REGEX_BLACKLIST = 3;
+
 function getGravityDBFilename()
 {
     // Get possible non-standard location of FTL's database
@@ -278,13 +284,3 @@ function remove_from_table($db, $table, $domains, $returnnum = false, $type = -1
 
     return 'Success, removed '.$num.' domain'.$plural;
 }
-
-if (!class_exists('ListType')) {
-    class ListType
-    {
-        public const whitelist = 0;
-        public const blacklist = 1;
-        public const regex_whitelist = 2;
-        public const regex_blacklist = 3;
-    }
-}
diff --git a/scripts/pi-hole/php/groups.php b/scripts/pi-hole/php/groups.php
index 5a12138e5..889cfcd9b 100644
--- a/scripts/pi-hole/php/groups.php
+++ b/scripts/pi-hole/php/groups.php
@@ -508,7 +508,7 @@ function verify_ID_array($arr)
                 array_push($groups, $gres['group_id']);
             }
             $res['groups'] = $groups;
-            if ($res['type'] === ListType::whitelist || $res['type'] === ListType::blacklist) {
+            if ($res['type'] === LISTTYPE_WHITELIST || $res['type'] === LISTTYPE_BLACKLIST) {
                 // Convert domain name to international form
                 // Skip this for the root zone `.`
                 if ($res['domain'] != '.') {
@@ -571,9 +571,9 @@ function verify_ID_array($arr)
         if (isset($_POST['type'])) {
             $type = intval($_POST['type']);
         } elseif (isset($_POST['list']) && $_POST['list'] === 'white') {
-            $type = ListType::whitelist;
+            $type = LISTTYPE_WHITELIST;
         } elseif (isset($_POST['list']) && $_POST['list'] === 'black') {
-            $type = ListType::blacklist;
+            $type = LISTTYPE_BLACKLIST;
         }
 
         if (!$insert_stmt->bindValue(':type', $type, SQLITE3_TEXT)
diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index d9a4ba27b..0161a9ad7 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -242,13 +242,13 @@ function archive_insert_into_table($file, $table, $flush = false, $wildcardstyle
     $type = null;
     if ($table === 'whitelist') {
         $table = 'domainlist';
-        $type = ListType::whitelist;
+        $type = LISTTYPE_WHITELIST;
     } elseif ($table === 'blacklist') {
         $table = 'domainlist';
-        $type = ListType::blacklist;
+        $type = LISTTYPE_BLACKLIST;
     } elseif ($table === 'regex_blacklist') {
         $table = 'domainlist';
-        $type = ListType::regex_blacklist;
+        $type = LISTTYPE_REGEX_BLACKLIST;
     } elseif ($table === 'domain_audit') {
         $table = 'domain_audit';
         $type = -1; // -1 -> not used inside add_to_table()
@@ -578,10 +578,10 @@ function noun($num)
         exit('cannot open/create '.htmlentities($archive_file_name)."<br>\nPHP user: ".exec('whoami')."\n");
     }
 
-    archive_add_table('whitelist.exact.json', 'domainlist', ListType::whitelist);
-    archive_add_table('whitelist.regex.json', 'domainlist', ListType::regex_whitelist);
-    archive_add_table('blacklist.exact.json', 'domainlist', ListType::blacklist);
-    archive_add_table('blacklist.regex.json', 'domainlist', ListType::regex_blacklist);
+    archive_add_table('whitelist.exact.json', 'domainlist', LISTTYPE_WHITELIST);
+    archive_add_table('whitelist.regex.json', 'domainlist', LISTTYPE_REGEX_WHITELIST);
+    archive_add_table('blacklist.exact.json', 'domainlist', LISTTYPE_BLACKLIST);
+    archive_add_table('blacklist.regex.json', 'domainlist', LISTTYPE_REGEX_BLACKLIST);
     archive_add_table('adlist.json', 'adlist');
     archive_add_table('domain_audit.json', 'domain_audit');
     archive_add_table('group.json', 'group');

From 3235056d31b038417b31151f85a29970b9c18918 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Mon, 5 Sep 2022 19:38:51 -0300
Subject: [PATCH 06/12] Add the ability to filter domains by type

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 groups-domains.php                   | 14 +++++++++
 scripts/pi-hole/js/groups-domains.js | 29 ++++++++++++++++++
 style/pi-hole.css                    | 45 ++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/groups-domains.php b/groups-domains.php
index f511f9f7f..cd536fd39 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -116,6 +116,20 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
+                <div class="row" id="filter_types_group">
+                    <div class="col-sm-12">
+                        <div class="filter_types">
+                            <div class="line">
+                                <span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
+                                <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
+                            </div>
+                            <div class="line">
+                                <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
+                                <span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <table id="domainsTable" class="table table-striped table-bordered" width="100%">
                     <thead>
                         <tr>
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 9eaeecd56..29f4c0c8f 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -335,6 +335,7 @@ function initTable() {
     ],
     dom:
       "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+      "<'#filter'>" +
       "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
       "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
@@ -383,6 +384,12 @@ function initTable() {
     input.setAttribute("spellcheck", false);
   }
 
+  table.on("init", function () {
+    // Put the type filter div into Datatables "DOM"
+    $("#filter").append($("#filter_types_group"));
+    $("#filter_types_group").show();
+  });
+
   table.on("init select deselect", function () {
     utils.changeBulkDeleteStates(table);
   });
@@ -402,6 +409,28 @@ function initTable() {
   });
 }
 
+// Enable "filter by type" functionality, using checkboxes
+$.fn.dataTable.ext.search.push(function (settings, searchData, index, rowData) {
+  var types = $(".filter_types input:checkbox:checked")
+    .map(function () {
+      return this.value;
+    })
+    .get();
+
+  if (types.length === 0) {
+    return true;
+  }
+
+  if (types.indexOf(rowData.type.toString()) !== -1) {
+    return true;
+  }
+
+  return false;
+});
+$(".filter_types input:checkbox").on("change", function () {
+  table.draw();
+});
+
 // Remove 'bnt-group' class from container, to avoid grouping
 $.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
 
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 212278c15..7037bba94 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -728,6 +728,51 @@ li:not(.menu-open) .treeview-menu .warning-count {
   }
 }
 
+/* Domains table: filter by type */
+#filter_types_group {
+  display: none;
+}
+.filter_types {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+}
+.filter_types div {
+  flex: 0 0 auto;
+}
+.filter_types span {
+  display: inline-block;
+  margin: 10px;
+  width: 120px;
+}
+
+/* Domains table: filter by type - smaller icheck */
+.filter_types .icheck-primary[class*="icheck-"] > label {
+  padding-left: 1.5em !important;
+  line-height: 1.2em;
+}
+.filter_types
+  .icheck-primary[class*="icheck-"]
+  > input:first-child
+  + input[type="hidden"]
+  + label::before,
+.filter_types .icheck-primary[class*="icheck-"] > input:first-child + label::before {
+  width: 1.2em;
+  height: 1.2em;
+  margin-left: -1.55em;
+}
+.filter_types
+  .icheck-primary[class*="icheck-"]
+  > input:first-child:checked
+  + input[type="hidden"]
+  + label::after,
+.filter_types .icheck-primary[class*="icheck-"] > input:first-child:checked + label::after {
+  width: 0.35em;
+  height: 0.7em;
+  top: -0.2em;
+  left: -0.18em;
+}
+
 /* reverse side menu collapse arrows when menu is closed */
 .sidebar-collapse .sidebar-toggle-svg svg {
   transform: scaleX(-1);

From 3ef30992c56c9fa6a9a75c95f464398d7dbffc09 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Tue, 6 Sep 2022 19:51:25 -0300
Subject: [PATCH 07/12] Move filter selector to header-box

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 groups-domains.php                   | 24 ++++++++++--------------
 scripts/pi-hole/js/groups-domains.js |  7 -------
 style/pi-hole.css                    | 18 +++++++++++++++---
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/groups-domains.php b/groups-domains.php
index cd536fd39..545b00e05 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -113,23 +113,19 @@
                 <h3 class="box-title">
                     List of domains
                 </h3>
+                <div class="filter_types">
+                    <div class="line">
+                        <span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
+                        <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
+                    </div>
+                    <div class="line">
+                        <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
+                        <span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
+                    </div>
+                </div>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <div class="row" id="filter_types_group">
-                    <div class="col-sm-12">
-                        <div class="filter_types">
-                            <div class="line">
-                                <span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
-                                <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
-                            </div>
-                            <div class="line">
-                                <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
-                                <span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <table id="domainsTable" class="table table-striped table-bordered" width="100%">
                     <thead>
                         <tr>
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 29f4c0c8f..7864f0b77 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -335,7 +335,6 @@ function initTable() {
     ],
     dom:
       "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
-      "<'#filter'>" +
       "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
       "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
@@ -384,12 +383,6 @@ function initTable() {
     input.setAttribute("spellcheck", false);
   }
 
-  table.on("init", function () {
-    // Put the type filter div into Datatables "DOM"
-    $("#filter").append($("#filter_types_group"));
-    $("#filter_types_group").show();
-  });
-
   table.on("init select deselect", function () {
     utils.changeBulkDeleteStates(table);
   });
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 7037bba94..422f4d772 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -729,27 +729,39 @@ li:not(.menu-open) .treeview-menu .warning-count {
 }
 
 /* Domains table: filter by type */
-#filter_types_group {
-  display: none;
+#domains-list .box-header {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 5px 10px;
+}
+#domains-list .box-header h3 {
+  flex: 1 1 auto;
+  margin: 5px 0;
+  width: auto;
+  min-width: 130px;
 }
 .filter_types {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
+  margin: 5px auto;
 }
 .filter_types div {
   flex: 0 0 auto;
+  margin: 2px 0 0;
 }
 .filter_types span {
   display: inline-block;
-  margin: 10px;
+  margin: 0 0 2px 10px !important;
   width: 120px;
+  min-height: 1.2em;
 }
 
 /* Domains table: filter by type - smaller icheck */
 .filter_types .icheck-primary[class*="icheck-"] > label {
   padding-left: 1.5em !important;
   line-height: 1.2em;
+  min-height: 1.2em;
 }
 .filter_types
   .icheck-primary[class*="icheck-"]

From e3b4cd92382e6f7fc6d2bf476854d80d556aaeb4 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Tue, 6 Sep 2022 21:06:39 -0300
Subject: [PATCH 08/12] Fix LCARS visual and allow user selected checkbox theme

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/header_authenticated.php |  2 +-
 style/pi-hole.css                            | 16 +++++++++-------
 style/themes/lcars.css                       | 11 +++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/scripts/pi-hole/php/header_authenticated.php b/scripts/pi-hole/php/header_authenticated.php
index 8e86a2f4c..f84ee5efc 100644
--- a/scripts/pi-hole/php/header_authenticated.php
+++ b/scripts/pi-hole/php/header_authenticated.php
@@ -137,7 +137,7 @@ function getTemperature()
 
 require 'header.php';
 ?>
-<body class="hold-transition sidebar-mini<?php if ($boxedlayout) { ?> layout-boxed<?php } ?><?php if ($auth) { ?> logged-in<?php } ?>">
+<body class="<?php echo $theme; ?> hold-transition sidebar-mini<?php if ($boxedlayout) { ?> layout-boxed<?php } ?><?php if ($auth) { ?> logged-in<?php } ?>">
 <noscript>
     <!-- JS Warning -->
     <div>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 422f4d772..0c24a6964 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -758,27 +758,29 @@ li:not(.menu-open) .treeview-menu .warning-count {
 }
 
 /* Domains table: filter by type - smaller icheck */
-.filter_types .icheck-primary[class*="icheck-"] > label {
+body:not(.lcars) .filter_types [class*="icheck-"] > label {
   padding-left: 1.5em !important;
   line-height: 1.2em;
   min-height: 1.2em;
 }
-.filter_types
-  .icheck-primary[class*="icheck-"]
+body:not(.lcars)
+  .filter_types
+  [class*="icheck-"]
   > input:first-child
   + input[type="hidden"]
   + label::before,
-.filter_types .icheck-primary[class*="icheck-"] > input:first-child + label::before {
+body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child + label::before {
   width: 1.2em;
   height: 1.2em;
   margin-left: -1.55em;
 }
-.filter_types
-  .icheck-primary[class*="icheck-"]
+body:not(.lcars)
+  .filter_types
+  [class*="icheck-"]
   > input:first-child:checked
   + input[type="hidden"]
   + label::after,
-.filter_types .icheck-primary[class*="icheck-"] > input:first-child:checked + label::after {
+body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child:checked + label::after {
   width: 0.35em;
   height: 0.7em;
   top: -0.2em;
diff --git a/style/themes/lcars.css b/style/themes/lcars.css
index 6b7145604..b8186cdb8 100644
--- a/style/themes/lcars.css
+++ b/style/themes/lcars.css
@@ -1743,6 +1743,17 @@ table.dataTable {
   }
 }
 
+/* Domains table: filter by type */
+.filter_types span {
+  width: 132px;
+}
+[class*="icheck-"] > label {
+  color: var(--text-color);
+}
+[class*="icheck-"] > label:hover {
+  color: #cde !important;
+}
+
 /*** Used by the long-term pages ***/
 .daterangepicker {
   background-color: #345;

From 4d8b19f4c92a1d9fca64c8aefca46647df0f4693 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Thu, 8 Sep 2022 21:55:56 -0300
Subject: [PATCH 09/12] Address team decisions

- change checkboxes order;
- remove all lines if all checkboxes are unselected.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 groups-domains.php                   | 4 ++--
 scripts/pi-hole/js/groups-domains.js | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/groups-domains.php b/groups-domains.php
index 545b00e05..2ac14dd63 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -116,10 +116,10 @@
                 <div class="filter_types">
                     <div class="line">
                         <span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
-                        <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
+                        <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
                     </div>
                     <div class="line">
-                        <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
+                        <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
                         <span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
                     </div>
                 </div>
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 7864f0b77..1dd2c026d 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -410,10 +410,6 @@ $.fn.dataTable.ext.search.push(function (settings, searchData, index, rowData) {
     })
     .get();
 
-  if (types.length === 0) {
-    return true;
-  }
-
   if (types.indexOf(rowData.type.toString()) !== -1) {
     return true;
   }

From 2851996fd28a78d798d1c5f008afd8ab5756ca29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sun, 11 Sep 2022 19:54:47 +0200
Subject: [PATCH 10/12] Update browserlist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 package-lock.json | 106 ++++++++++++++++++++++------------------------
 package.json      |   3 +-
 2 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97ddfde66..afc82b842 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -133,7 +133,7 @@
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "@types/minimist": {
@@ -229,7 +229,7 @@
     "array-find": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ==",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
       "dev": true
     },
     "array-includes": {
@@ -312,12 +312,6 @@
             "update-browserslist-db": "^1.0.5"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001373",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz",
-          "integrity": "sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==",
-          "dev": true
-        },
         "electron-to-chromium": {
           "version": "1.4.206",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz",
@@ -434,9 +428,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001307",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz",
-      "integrity": "sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==",
+      "version": "1.0.30001393",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz",
+      "integrity": "sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==",
       "dev": true
     },
     "chalk": {
@@ -471,7 +465,7 @@
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         }
       }
@@ -501,7 +495,7 @@
     "clean-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
-      "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
@@ -536,13 +530,13 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
     "confusing-browser-globals": {
@@ -599,7 +593,7 @@
     "decamelize-keys": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "requires": {
         "decamelize": "^1.1.0",
@@ -609,13 +603,13 @@
         "decamelize": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "map-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
           "dev": true
         }
       }
@@ -681,7 +675,7 @@
     "enhance-visitors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/enhance-visitors/-/enhance-visitors-1.0.0.tgz",
-      "integrity": "sha512-+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA==",
+      "integrity": "sha1-qpRdBdpGVnKh69OP7i7T2oUY6Vo=",
       "dev": true,
       "requires": {
         "lodash": "^4.13.1"
@@ -690,7 +684,7 @@
     "enhanced-resolve": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -773,7 +767,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
     "eslint": {
@@ -1390,7 +1384,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
     "fastq": {
@@ -1531,7 +1525,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
     "fsevents": {
@@ -1562,7 +1556,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
     "functions-have-names": {
@@ -1591,7 +1585,7 @@
     "get-set-props": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-set-props/-/get-set-props-0.1.0.tgz",
-      "integrity": "sha512-7oKuKzAGKj0ag+eWZwcGw2fjiZ78tXnXQoBgY0aU7ZOxTu4bB7hSuQSDgtKy978EDH062P5FmD2EWiDpQS9K9Q==",
+      "integrity": "sha1-mYR1wXhEVobQsyJG2l3428++jqM=",
       "dev": true
     },
     "get-stdin": {
@@ -1705,7 +1699,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
     "has-property-descriptors": {
@@ -1775,7 +1769,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
     "indent-string": {
@@ -1787,7 +1781,7 @@
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
         "once": "^1.3.0",
@@ -1836,7 +1830,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
     "is-bigint": {
@@ -1921,7 +1915,7 @@
     "is-get-set-prop": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-get-set-prop/-/is-get-set-prop-1.0.0.tgz",
-      "integrity": "sha512-DvAYZ1ZgGUz4lzxKMPYlt08qAUqyG9ckSg2pIjfvcQ7+pkVNUHk8yVLXOnCLe5WKXhLop8oorWFBJHpwWQpszQ==",
+      "integrity": "sha1-JzGHfk14pqae3M5rudaLB3nnYxI=",
       "dev": true,
       "requires": {
         "get-set-props": "^0.1.0",
@@ -1940,7 +1934,7 @@
     "is-js-type": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-js-type/-/is-js-type-2.0.0.tgz",
-      "integrity": "sha512-Aj13l47+uyTjlQNHtXBV8Cji3jb037vxwMWCgopRR8h6xocgBGW3qG8qGlIOEmbXQtkKShKuBM9e8AA1OeQ+xw==",
+      "integrity": "sha1-c2FwBtZZtOtHKbunR9KHgt8PfiI=",
       "dev": true,
       "requires": {
         "js-types": "^1.0.0"
@@ -1949,7 +1943,7 @@
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
       "dev": true
     },
     "is-negative-zero": {
@@ -1976,7 +1970,7 @@
     "is-obj-prop": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-obj-prop/-/is-obj-prop-1.0.0.tgz",
-      "integrity": "sha512-5Idb61slRlJlsAzi0Wsfwbp+zZY+9LXKUAZpvT/1ySw+NxKLRWfa0Bzj+wXI3fX5O9hiddm5c3DAaRSNP/yl2w==",
+      "integrity": "sha1-s03nnEULjXxzqyzfZ9yHWtuF+A4=",
       "dev": true,
       "requires": {
         "lowercase-keys": "^1.0.0",
@@ -1986,7 +1980,7 @@
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true
     },
     "is-proto-prop": {
@@ -2093,7 +2087,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
     "js-tokens": {
@@ -2105,7 +2099,7 @@
     "js-types": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/js-types/-/js-types-1.0.0.tgz",
-      "integrity": "sha512-bfwqBW9cC/Lp7xcRpug7YrXm0IVw+T9e3g4mCYnv0Pjr3zIzU9PCQElYU9oSGAWzXlbdl9X5SAMPejO9sxkeUw==",
+      "integrity": "sha1-0kLmSU7Vcq08koCfyL7X92h8vwM=",
       "dev": true
     },
     "js-yaml": {
@@ -2132,7 +2126,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
     "json5": {
@@ -2307,7 +2301,7 @@
     "memory-fs": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
       "dev": true
     },
     "meow": {
@@ -2451,7 +2445,7 @@
         "arrify": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         }
       }
@@ -2471,7 +2465,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
     "node-releases": {
@@ -2509,7 +2503,7 @@
     "normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
     "npm-run-path": {
@@ -2565,7 +2559,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -2679,7 +2673,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
     "path-key": {
@@ -2715,7 +2709,7 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
     "pkg-dir": {
@@ -2831,7 +2825,7 @@
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
     "proto-props": {
@@ -2861,7 +2855,7 @@
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
         "pify": "^2.3.0"
@@ -3005,7 +2999,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
     "resolve": {
@@ -3188,7 +3182,7 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true
     },
     "strip-final-newline": {
@@ -3257,13 +3251,13 @@
     "tapable": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
       "dev": true
     },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
     "thenby": {
@@ -3275,7 +3269,7 @@
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
@@ -3356,7 +3350,7 @@
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
     "universalify": {
@@ -3442,7 +3436,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
     "xo": {
@@ -3452,15 +3446,15 @@
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
-        "@typescript-eslint/eslint-plugin": "*",
-        "@typescript-eslint/parser": "*",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
         "arrify": "^3.0.0",
         "cosmiconfig": "^7.0.1",
         "define-lazy-prop": "^3.0.0",
         "eslint": "^8.22.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-config-xo": "^0.42.0",
-        "eslint-config-xo-typescript": "*",
+        "eslint-config-xo-typescript": "^0.53.0",
         "eslint-formatter-pretty": "^4.1.0",
         "eslint-import-resolver-webpack": "^0.13.2",
         "eslint-plugin-ava": "^13.2.0",
diff --git a/package.json b/package.json
index 94a04bf80..dfd3061bf 100644
--- a/package.json
+++ b/package.json
@@ -101,5 +101,6 @@
       "unicorn/prefer-string-slice": "off",
       "unicorn/prevent-abbreviations": "off"
     }
-  }
+  },
+  "dependencies": {}
 }

From 43056fdcaf08c3ff60b40d28c3f8bc7ac753d9fd Mon Sep 17 00:00:00 2001
From: jpgpi250 <jpgpi250@gmail.com>
Date: Mon, 12 Sep 2022 12:57:18 +0200
Subject: [PATCH 11/12] Update queries.js

jpgpi250 <jpgpi250@gmail.com>

accompanies FTL PR 1409
---
 scripts/pi-hole/js/queries.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 19d883268..d96ac77e3 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -113,7 +113,12 @@ $(function () {
         buttontext = "",
         blocked = false,
         isCNAME = false,
-        regexLink = false;
+        DomainlistLink = false;
+
+      // accompanies Store domainlist IDs for blocked/permitted queries FTL PR 1409
+      if (data.length > 9 && Number.isInteger(parseInt(data[9], 10)) && data[9] > 0) {
+        DomainlistLink = true;
+      }
 
       switch (data[4]) {
         case "1":
@@ -141,10 +146,6 @@ $(function () {
         case "4":
           fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist)";
           blocked = true;
-          if (data.length > 9 && data[9] > 0) {
-            regexLink = true;
-          }
-
           buttontext =
             '<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
           break;
@@ -183,10 +184,6 @@ $(function () {
           fieldtext =
             "<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist, CNAME)</span>";
           blocked = true;
-          if (data.length > 9 && data[9] > 0) {
-            regexLink = true;
-          }
-
           buttontext =
             '<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
           isCNAME = true;
@@ -242,10 +239,10 @@ $(function () {
       $("td:eq(4)", row).html(fieldtext);
       $("td:eq(6)", row).html(buttontext);
 
-      if (regexLink) {
+      if (DomainlistLink) {
         $("td:eq(4)", row).hover(
           function () {
-            this.title = "Click to show matching regex filter";
+            this.title = "Click to show matching blacklist/whitelist domain";
             this.style.color = "#72afd2";
           },
           function () {

From fcdde5cf5775126400d93ba6cbf4cafed9c42307 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Tue, 13 Sep 2022 18:44:54 -0300
Subject: [PATCH 12/12] Avoid message warnings if session was already started.

fix #2350

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/auth.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
index 59a4389aa..0db345003 100644
--- a/scripts/pi-hole/php/auth.php
+++ b/scripts/pi-hole/php/auth.php
@@ -101,7 +101,9 @@ function check_cors()
 function check_csrf($token)
 {
     // Start a new PHP session (or continue an existing one)
-    start_php_session();
+    if (session_status() != PHP_SESSION_ACTIVE) {
+        start_php_session();
+    }
 
     if (!isset($_SESSION['token'])) {
         log_and_die('Session expired! Please re-login on the Pi-hole dashboard.');