Merge branch 'master' into master-to-development-v5.0

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-10 22:00:07 +02:00
23 changed files with 711 additions and 2024 deletions

View File

@@ -276,7 +276,8 @@ $(document).ready(function () {
this.style.color = "";
}
);
$("td:eq(4)", row).click(function () {
$("td:eq(4)", row).off(); // Release any possible previous onClick event handlers
$("td:eq(4)", row).click(function() {
var new_tab = window.open("groups-domains.php?domainid=" + data[9], "_blank");
if (new_tab) {
new_tab.focus();
@@ -286,11 +287,18 @@ $(document).ready(function () {
$("td:eq(4)", row).addClass("pointer");
}
// Add domain in CNAME chain causing the query to have been blocked
// Substitute domain by "." if empty
var domain = data[2];
var CNAME_domain = data[8];
if (domain.length === 0) {
domain = ".";
}
if (isCNAME) {
var CNAME_domain = data[8];
// Add domain in CNAME chain causing the query to have been blocked
$("td:eq(2)", row).text(domain + "\n(blocked " + CNAME_domain + ")");
} else {
$("td:eq(2)", row).text(domain);
}
// Check for existence of sixth column and display only if not Pi-holed