Merge branch 'release/v5.0' into new/intl_domains

list.php

@@ -8,7 +8,7 @@
 
 require "scripts/pi-hole/php/header.php";
 
-$list = $_GET['l'] ?? '';
+$list = isset($_GET['l']) ? $_GET['l'] : '';
 
 if ($list == "white")
 {

scripts/pi-hole/js/groups-adlists.js

@@ -183,6 +183,10 @@ function initTable() {
         "</button>";
       $("td:eq(4)", row).html(button);
     },
+    dom:
+      "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
+      "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
+      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"]

scripts/pi-hole/js/groups-clients.js

@@ -189,6 +189,10 @@ function initTable() {
         "</button>";
       $("td:eq(2)", row).html(button);
     },
+    dom:
+      "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
+      "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
+      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"]

scripts/pi-hole/js/groups-domains.js

@@ -200,6 +200,10 @@ function initTable() {
         "</button>";
       $("td:eq(5)", row).html(button);
     },
+    dom:
+      "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
+      "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
+      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"]

scripts/pi-hole/js/groups.js

@@ -144,6 +144,10 @@ $(document).ready(function() {
         $("td:eq(3)", row).html(button);
       }
     },
+    dom:
+      "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
+      "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
+      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"]

scripts/pi-hole/js/queries.js

@@ -228,6 +228,11 @@ $(document).ready(function() {
           buttontext = "";
       }
 
+      // Add extra label when blocking happend during deep CNAME inspection
+      if (blocked && data.length > 6 && data[6] === "3") {
+        fieldtext += "<br>CNAME";
+      }
+
       $(row).addClass(colorClass);
       $("td:eq(4)", row).html(fieldtext);
       $("td:eq(6)", row).html(buttontext);

scripts/pi-hole/php/groups.php

@@ -209,7 +209,7 @@ if ($_POST['action'] == 'get_groups') {
         // Loop over results
         $ips = array();
         while ($res = $query->fetchArray(SQLITE3_ASSOC)) {
-            $ips[$res['ip']] = $res['name'];
+            $ips[$res['ip']] = $res['name'] !== null ? $res['name'] : '';
         }
         $FTLdb->close();