pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Schaper
2020-01-25 17:49:02 -08:00
committed by GitHub
parent 65be9d89ef 88da85f553
commit 89cf4b279b
7 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
list.php
+1 -1
View File
@@ -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
+4
View File
@@ -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
+4
View File
@@ -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
+4
View File
@@ -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
+4
View File
@@ -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
+5
View File
@@ -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
+1 -1
View File
@@ -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();