" +
url +
" " +
data.top_ads[domain] +
@@ -89,8 +88,14 @@ function updateTopLists() {
$("#domain-frequency .overlay").hide();
$("#ad-frequency .overlay").hide();
- // Update top lists data every second
- setTimeout(updateTopLists, 1000);
+ // Update top lists data every ten seconds
+ // Updates are also triggered by button actions
+ // and reset the running timer
+ if (auditTimeout !== null) {
+ window.clearTimeout(auditTimeout);
+ }
+
+ auditTimeout = setTimeout(updateTopLists, 10000);
});
}
@@ -99,10 +104,32 @@ function add(domain, list) {
$.ajax({
url: "scripts/pi-hole/php/add.php",
method: "post",
- data: { domain: domain, list: list, token: token }
+ data: { domain: domain, list: list, token: token },
+ success: function() {
+ updateTopLists();
+ },
+ error: function(jqXHR, exception) {
+ console.log(exception);
+ }
});
}
+function blacklistUrl(url) {
+ // We add to audit last as it will reload the table on success
+ add(url, "black");
+ add(url, "audit");
+}
+
+function whitelistUrl(url) {
+ // We add to audit last as it will reload the table on success
+ add(url, "white");
+ add(url, "audit");
+}
+
+function auditUrl(url) {
+ add(url, "audit");
+}
+
$(document).ready(function() {
// Pull in data via AJAX
updateTopLists();
@@ -110,11 +137,9 @@ $(document).ready(function() {
$("#domain-frequency tbody").on("click", "button", function() {
var url = $(this)
.parents("tr")[0]
- .textContent.split(" ")[0];
+ .textContent.split(" ")[0];
if ($(this).context.textContent === " Blacklist") {
- add(url, "audit");
- add(url, "black");
- $("#gravityBtn").prop("disabled", false);
+ blacklistUrl(url);
} else {
auditUrl(url);
}
@@ -123,36 +148,11 @@ $(document).ready(function() {
$("#ad-frequency tbody").on("click", "button", function() {
var url = $(this)
.parents("tr")[0]
- .textContent.split(" ")[0]
- .split(" ")[0];
+ .textContent.split(" ")[0];
if ($(this).context.textContent === " Whitelist") {
- add(url, "audit");
- add(url, "white");
- $("#gravityBtn").prop("disabled", false);
+ whitelistUrl(url);
} else {
auditUrl(url);
}
});
});
-
-function auditUrl(url) {
- if (auditList.indexOf(url) > -1) {
- return;
- }
-
- if (auditTimeout) {
- clearTimeout(auditTimeout);
- }
-
- auditList.push(url);
- // wait 3 seconds to see if more domains need auditing
- // and batch them all into a single request
- auditTimeout = setTimeout(function() {
- add(auditList.join(" "), "audit");
- auditList = [];
- }, 3000);
-}
-
-$("#gravityBtn").on("click", function() {
- window.location.replace("gravity.php?go");
-});
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index d7f4fe12..f8c22119 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -195,6 +195,18 @@ function getQueryTypes() {
queryType.push([6, 7, 8]);
}
+ if ($("#type_gravity_CNAME").prop("checked")) {
+ queryType.push(9);
+ }
+
+ if ($("#type_regex_CNAME").prop("checked")) {
+ queryType.push(10);
+ }
+
+ if ($("#type_blacklist_CNAME").prop("checked")) {
+ queryType.push(11);
+ }
+
return queryType.join(",");
}
@@ -282,13 +294,13 @@ $(document).ready(function() {
break;
case 4:
color = "red";
- fieldtext = "Blocked " + title + " Error, something went wrong! ' + data.address + ""
+ '' + data.address + ""
);
var disabled = data.enabled === 0;
$("td:eq(1)", row).html(
- '' +
+ '
'
+ );
+ var selectEl = $("#multiselect_" + data.id, row);
// Add all known groups
for (var i = 0; i < groups.length; i++) {
var extra = "";
@@ -162,7 +97,7 @@ function initTable() {
extra = " (disabled)";
}
- sel.append(
+ selectEl.append(
$("
',
+ maxHeight: 200,
+ onDropdownShown: function() {
+ var el = $("#container_" + data.id);
+ var top = el[0].getBoundingClientRect().top;
+ var bottom = $(window).height() - top - el.height();
+ if (bottom < 200) {
+ el.addClass("dropup");
+ }
+
+ if (bottom > 200) {
+ el.removeClass("dropup");
+ }
+
+ var offset = el.offset();
+ $("body").append(el);
+ el.css("position", "absolute");
+ el.css("top", offset.top + "px");
+ el.css("left", offset.left + "px");
+ },
+ onDropdownHide: function() {
+ var el = $("#container_" + data.id);
+ var home = $("#selectHome_" + data.id);
+ home.append(el);
+ el.removeAttr("style");
+ }
+ });
+ selectEl.on("change", editAdlist);
var button =
- '' +
'" + title + " Error, something went wrong! ' +
- data.ip +
- '' + data.ip + "";
if (data.name !== null && data.name.length > 0)
- ip_name += '' + data.name + "";
+ ip_name +=
+ '' + data.name + "";
$("td:eq(0)", row).html(ip_name);
- $("td:eq(1)", row).empty();
- $("td:eq(1)", row).append('' +
+ '
'
+ );
+ var selectEl = $("#multiselect_" + data.id, row);
// Add all known groups
for (var i = 0; i < groups.length; i++) {
var extra = "";
@@ -168,7 +128,7 @@ function initTable() {
extra = " (disabled)";
}
- sel.append(
+ selectEl.append(
$("
',
+ maxHeight: 200,
+ onDropdownShown: function() {
+ var el = $("#container_" + data.id);
+ var top = el[0].getBoundingClientRect().top;
+ var bottom = $(window).height() - top - el.height();
+ if (bottom < 200) {
+ el.addClass("dropup");
+ }
+
+ if (bottom > 200) {
+ el.removeClass("dropup");
+ }
+
+ var offset = el.offset();
+ $("body").append(el);
+ el.css("position", "absolute");
+ el.css("top", offset.top + "px");
+ el.css("left", offset.left + "px");
+ },
+ onDropdownHide: function() {
+ var el = $("#container" + data.id);
+ var home = $("#selectHome" + data.id);
+ home.append(el);
+ el.removeAttr("style");
+ }
+ });
+ selectEl.on("change", editClient);
var button =
- '' +
' ";
- $("td:eq(2)", row).html(button);
+ $("td:eq(3)", row).html(button);
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
@@ -238,14 +226,32 @@ function initTable() {
function addClient() {
var ip = $("#select").val();
+ var comment = $("#new_comment").val();
if (ip === "custom") {
ip = $("#ip-custom").val();
}
- showAlert("info", "", "Adding client...", ip);
+ utils.disableAll();
+ utils.showAlert("info", "", "Adding client...", ip);
if (ip.length === 0) {
- showAlert("warning", "", "Warning", "Please specify a client IP address");
+ utils.enableAll();
+ utils.showAlert("warning", "", "Warning", "Please specify a client IP address");
+ return;
+ }
+
+ // Validate IP address (may contain CIDR details)
+ var ipv6format = ip.includes(":");
+
+ if (!ipv6format && !utils.validateIPv4CIDR(ip)) {
+ utils.enableAll();
+ utils.showAlert("warning", "", "Warning", "Invalid IPv4 address!");
+ return;
+ }
+
+ if (ipv6format && !utils.validateIPv6CIDR(ip)) {
+ utils.enableAll();
+ utils.showAlert("warning", "", "Warning", "Invalid IPv6 address!");
return;
}
@@ -253,18 +259,20 @@ function addClient() {
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: "json",
- data: { action: "add_client", ip: ip, token: token },
+ data: { action: "add_client", ip: ip, comment: comment, token: token },
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert("success", "glyphicon glyphicon-plus", "Successfully added client", ip);
+ utils.showAlert("success", "glyphicon glyphicon-plus", "Successfully added client", ip);
reload_client_suggestions();
table.ajax.reload();
} else {
- showAlert("error", "", "Error while adding new client", response.message);
+ utils.showAlert("error", "", "Error while adding new client", response.message);
}
},
error: function(jqXHR, exception) {
- showAlert("error", "", "Error while adding new client", jqXHR.responseText);
+ utils.enableAll();
+ utils.showAlert("error", "", "Error while adding new client", jqXHR.responseText);
console.log(exception);
}
});
@@ -273,16 +281,26 @@ function addClient() {
function editClient() {
var elem = $(this).attr("id");
var tr = $(this).closest("tr");
- var id = tr.find("#id").val();
- var groups = tr.find("#multiselect").val();
- var ip = tr.find("#ip").text();
- var name = tr.find("#name").text();
+ var id = tr.attr("data-id");
+ var groups = tr.find("#multiselect_" + id).val();
+ var ip = tr.find("#ip_" + id).text();
+ var name = tr.find("#name_" + id).text();
+ var comment = tr.find("#comment_" + id).val();
var done = "edited";
var not_done = "editing";
- if (elem === "multiselect") {
- done = "edited groups of";
- not_done = "editing groups of";
+ switch (elem) {
+ case "multiselect_" + id:
+ done = "edited groups of";
+ not_done = "editing groups of";
+ break;
+ case "comment_" + id:
+ done = "edited comment of";
+ not_done = "editing comment of";
+ break;
+ default:
+ alert("bad element or invalid data-id!");
+ return;
}
var ip_name = ip;
@@ -290,26 +308,39 @@ function editClient() {
ip_name += " (" + name + ")";
}
- showAlert("info", "", "Editing client...", ip_name);
+ utils.disableAll();
+ utils.showAlert("info", "", "Editing client...", ip_name);
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: "json",
- data: { action: "edit_client", id: id, groups: groups, token: token },
+ data: {
+ action: "edit_client",
+ id: id,
+ groups: groups,
+ token: token,
+ comment: comment
+ },
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert(
+ utils.showAlert(
"success",
"glyphicon glyphicon-plus",
"Successfully " + done + " client",
ip_name
);
} else {
- showAlert("error", "Error while " + not_done + " client with ID " + id, response.message);
+ utils.showAlert(
+ "error",
+ "Error while " + not_done + " client with ID " + id,
+ response.message
+ );
}
},
error: function(jqXHR, exception) {
- showAlert(
+ utils.enableAll();
+ utils.showAlert(
"error",
"",
"Error while " + not_done + " client with ID " + id,
@@ -321,36 +352,44 @@ function editClient() {
}
function deleteClient() {
- var id = $(this).attr("data-id");
var tr = $(this).closest("tr");
- var ip = tr.find("#ip").text();
- var name = tr.find("#name").text();
+ var id = tr.attr("data-id");
+ var ip = tr.find("#ip_" + id).text();
+ var name = tr.find("#name_" + id).text();
var ip_name = ip;
if (name.length > 0) {
ip_name += " (" + name + ")";
}
- showAlert("info", "", "Deleting client...", ip_name);
+ utils.disableAll();
+ utils.showAlert("info", "", "Deleting client...", ip_name);
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: "json",
data: { action: "delete_client", id: id, token: token },
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted client ", ip_name);
+ utils.showAlert(
+ "success",
+ "glyphicon glyphicon-trash",
+ "Successfully deleted client ",
+ ip_name
+ );
table
.row(tr)
.remove()
.draw(false);
reload_client_suggestions();
} else {
- showAlert("error", "", "Error while deleting client with ID " + id, response.message);
+ utils.showAlert("error", "", "Error while deleting client with ID " + id, response.message);
}
},
error: function(jqXHR, exception) {
- showAlert("error", "", "Error while deleting client with ID " + id, jqXHR.responseText);
+ utils.enableAll();
+ utils.showAlert("error", "", "Error while deleting client with ID " + id, jqXHR.responseText);
console.log(exception);
}
});
diff --git a/scripts/pi-hole/js/groups-common.js b/scripts/pi-hole/js/groups-common.js
new file mode 100644
index 00000000..e50d0af7
--- /dev/null
+++ b/scripts/pi-hole/js/groups-common.js
@@ -0,0 +1,141 @@
+/* Pi-hole: A black hole for Internet advertisements
+ * (c) 2020 Pi-hole, LLC (https://pi-hole.net)
+ * Network-wide ad blocking via your own hardware.
+ *
+ * This file is copyright under the latest version of the EUPL.
+ * Please see LICENSE file for your rights under this license. */
+
+/* global moment:false */
+
+var info = null;
+function showAlert(type, icon, title, message) {
+ var opts = {};
+ title = " " + title + " Error, something went wrong! " + title + " Error, something went wrong! ' + data.domain + ""
+ '' +
+ data.domain +
+ ""
);
- $("td:eq(1)", row).html(
- '' +
+ var whitelist_options = "";
+ if (showtype === "all" || showtype === "white") {
+ whitelist_options =
'Exact whitelist " +
- 'Exact blacklist " +
'Regex whitelist " +
+ ">Regex whitelist";
+ }
+
+ var blacklist_options = "";
+ if (showtype === "all" || showtype === "black") {
+ blacklist_options =
+ 'Exact blacklist " +
'Regex blacklist " +
+ ">Regex blacklist";
+ }
+
+ $("td:eq(1)", row).html(
+ '' +
+ whitelist_options +
+ blacklist_options +
" "
);
- $("#type", row).on("change", editDomain);
+ var typeEl = $("#type_" + data.id, row);
+ typeEl.on("change", editDomain);
var disabled = data.enabled === 0;
$("td:eq(2)", row).html(
- '' +
+ '
'
+ );
+ var selectEl = $("#multiselect_" + data.id, row);
+ // Add all known groups
+ for (var i = 0; i < groups.length; i++) {
+ var extra = "";
+ if (!groups[i].enabled) {
+ extra = " (disabled)";
+ }
+
+ selectEl.append(
+ $("
',
+ maxHeight: 200,
+ onDropdownShown: function() {
+ var el = $("#container_" + data.id);
+ var top = el[0].getBoundingClientRect().top;
+ var bottom = $(window).height() - top - el.height();
+ if (bottom < 200) {
+ el.addClass("dropup");
+ }
+
+ if (bottom > 200) {
+ el.removeClass("dropup");
+ }
+
+ var offset = el.offset();
+ $("body").append(el);
+ el.css("position", "absolute");
+ el.css("top", offset.top + "px");
+ el.css("left", offset.left + "px");
+ },
+ onDropdownHide: function() {
+ var el = $("#container_" + data.id);
+ var home = $("#selectHome_" + data.id);
+ home.append(el);
+ el.removeAttr("style");
+ }
+ });
+ selectEl.on("change", editDomain);
}
- // Select assigned groups
- sel.val(data.groups);
- // Initialize multiselect
- sel.multiselect({ includeSelectAllOption: true });
- sel.on("change", editDomain);
+ // Highlight row (if url parameter "domainid=" is used)
+ if ("domainid" in GETDict && data.id === parseInt(GETDict.domainid)) {
+ $(row)
+ .find("td")
+ .addClass("highlight");
+ }
var button =
- '' +
' ";
- $("td:eq(5)", row).html(button);
+ if (table.column(5).visible()) {
+ $("td:eq(5)", row).html(button);
+ } else {
+ $("td:eq(4)", row).html(button);
+ }
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
@@ -228,8 +257,22 @@ function initTable() {
data.search.search = "";
// Reset visibility of ID column
data.columns[0].visible = false;
+ // Show group assignment column only on full page
+ data.columns[5].visible = showtype === "all";
// Apply loaded state to table
return data;
+ },
+ initComplete: function() {
+ if ("domainid" in GETDict) {
+ var pos = table
+ .column(0, { order: "current" })
+ .data()
+ .indexOf(parseInt(GETDict.domainid));
+ if (pos >= 0) {
+ var page = Math.floor(pos / table.page.info().length);
+ table.page(page).draw(false);
+ }
+ }
}
});
@@ -248,14 +291,53 @@ function initTable() {
}
function addDomain() {
- var domain = $("#new_domain").val();
- var type = $("#new_type").val();
- var comment = $("#new_comment").val();
+ var action = this.id;
+ var tabHref = $('a[data-toggle="tab"][aria-expanded="true"]').attr("href");
+ var wildcardEl = $("#wildcard_checkbox");
+ var wildcard_checked = wildcardEl.prop("checked");
+ var type;
- showAlert("info", "", "Adding domain...", domain);
+ // current tab's inputs
+ var domain_regex, domainEl, commentEl;
+ if (tabHref === "#tab_domain") {
+ domain_regex = "domain";
+ domainEl = $("#new_domain");
+ commentEl = $("#new_domain_comment");
+ } else if (tabHref === "#tab_regex") {
+ domain_regex = "regex";
+ domainEl = $("#new_regex");
+ commentEl = $("#new_regex_comment");
+ }
- if (domain.length === 0) {
- showAlert("warning", "", "Warning", "Please specify a domain");
+ var domain = domainEl.val();
+ var comment = commentEl.val();
+
+ utils.disableAll();
+ utils.showAlert("info", "", "Adding " + domain_regex + "...", domain);
+
+ if (domain.length > 0) {
+ // strip "*." if specified by user in wildcard mode
+ if (domain_regex === "domain" && wildcard_checked && domain.startsWith("*.")) {
+ domain = domain.substr(2);
+ }
+
+ // determine list type
+ if (domain_regex === "domain" && action === "add2black" && wildcard_checked) {
+ type = "3W";
+ } else if (domain_regex === "domain" && action === "add2black" && !wildcard_checked) {
+ type = "1";
+ } else if (domain_regex === "domain" && action === "add2white" && wildcard_checked) {
+ type = "2W";
+ } else if (domain_regex === "domain" && action === "add2white" && !wildcard_checked) {
+ type = "0";
+ } else if (domain_regex === "regex" && action === "add2black") {
+ type = "3";
+ } else if (domain_regex === "regex" && action === "add2white") {
+ type = "2";
+ }
+ } else {
+ utils.enableAll();
+ utils.showAlert("warning", "", "Warning", "Please specify a " + domain_regex);
return;
}
@@ -271,15 +353,25 @@ function addDomain() {
token: token
},
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert("success", "glyphicon glyphicon-plus", "Successfully added domain", domain);
- $("#new_domain").val("");
- $("#new_comment").val("");
+ utils.showAlert(
+ "success",
+ "glyphicon glyphicon-plus",
+ "Successfully added " + domain_regex,
+ domain
+ );
+ domainEl.val("");
+ commentEl.val("");
+ wildcardEl.prop("checked", false);
table.ajax.reload();
- } else showAlert("error", "", "Error while adding new domain", response.message);
+ } else {
+ utils.showAlert("error", "", "Error while adding new " + domain_regex, response.message);
+ }
},
error: function(jqXHR, exception) {
- showAlert("error", "", "Error while adding new domain", jqXHR.responseText);
+ utils.enableAll();
+ utils.showAlert("error", "", "Error while adding new " + domain_regex, jqXHR.responseText);
console.log(exception);
}
});
@@ -288,36 +380,60 @@ function addDomain() {
function editDomain() {
var elem = $(this).attr("id");
var tr = $(this).closest("tr");
- var domain = tr.find("#domain").text();
- var id = tr.find("#id").val();
- var type = tr.find("#type").val();
- var status = tr.find("#status").is(":checked") ? 1 : 0;
- var comment = tr.find("#comment").val();
- var groups = tr.find("#multiselect").val();
+ var id = tr.attr("data-id");
+ var domain = tr.find("#domain_" + id).text();
+ var type = tr.find("#type_" + id).val();
+ var status = tr.find("#status_" + id).is(":checked") ? 1 : 0;
+ var comment = tr.find("#comment_" + id).val();
+
+ // Show group assignment field only if in full domain management mode
+ // if not included, just use the row data.
+ var rowData = table.row(tr).data();
+ var groups = table.column(5).visible() ? tr.find("#multiselect_" + id).val() : rowData.groups;
+
+ var domain_regex;
+ if (type === "0" || type === "1") {
+ domain_regex = "domain";
+ } else if (type === "2" || type === "3") {
+ domain_regex = "regex";
+ }
var done = "edited";
var not_done = "editing";
- if (elem === "status" && status === 1) {
- done = "enabled";
- not_done = "enabling";
- } else if (elem === "status" && status === 0) {
- done = "disabled";
- not_done = "disabling";
- } else if (elem === "name") {
- done = "edited name of";
- not_done = "editing name of";
- } else if (elem === "comment") {
- done = "edited comment of";
- not_done = "editing comment of";
- } else if (elem === "type") {
- done = "edited type of";
- not_done = "editing type of";
- } else if (elem === "multiselect") {
- done = "edited groups of";
- not_done = "editing groups of";
+ switch (elem) {
+ case "status_" + id:
+ if (status === 0) {
+ done = "disabled";
+ not_done = "disabling";
+ } else if (status === 1) {
+ done = "enabled";
+ not_done = "enabling";
+ }
+
+ break;
+ case "name_" + id:
+ done = "edited name of";
+ not_done = "editing name of";
+ break;
+ case "comment_" + id:
+ done = "edited comment of";
+ not_done = "editing comment of";
+ break;
+ case "type_" + id:
+ done = "edited type of";
+ not_done = "editing type of";
+ break;
+ case "multiselect_" + id:
+ done = "edited groups of";
+ not_done = "editing groups of";
+ break;
+ default:
+ alert("bad element or invalid data-id!");
+ return;
}
- showAlert("info", "", "Editing domain...", name);
+ utils.disableAll();
+ utils.showAlert("info", "", "Editing " + domain_regex + "...", name);
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
@@ -332,26 +448,28 @@ function editDomain() {
token: token
},
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert(
+ utils.showAlert(
"success",
"glyphicon glyphicon-pencil",
- "Successfully " + done + " domain",
+ "Successfully " + done + " " + domain_regex,
domain
);
} else
- showAlert(
+ utils.showAlert(
"error",
"",
- "Error while " + not_done + " domain with ID " + id,
+ "Error while " + not_done + " " + domain_regex + " with ID " + id,
response.message
);
},
error: function(jqXHR, exception) {
- showAlert(
+ utils.enableAll();
+ utils.showAlert(
"error",
"",
- "Error while " + not_done + " domain with ID " + id,
+ "Error while " + not_done + " " + domain_regex + " with ID " + id,
jqXHR.responseText
);
console.log(exception);
@@ -360,27 +478,55 @@ function editDomain() {
}
function deleteDomain() {
- var id = $(this).attr("data-id");
var tr = $(this).closest("tr");
- var domain = tr.find("#domain").text();
+ var id = tr.attr("data-id");
+ var domain = tr.find("#domain_" + id).text();
+ var type = tr.find("#type_" + id).val();
- showAlert("info", "", "Deleting domain...", domain);
+ var domain_regex;
+ if (type === "0" || type === "1") {
+ domain_regex = "domain";
+ } else if (type === "2" || type === "3") {
+ domain_regex = "regex";
+ }
+
+ utils.disableAll();
+ utils.showAlert("info", "", "Deleting " + domain_regex + "...", domain);
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: "json",
data: { action: "delete_domain", id: id, token: token },
success: function(response) {
+ utils.enableAll();
if (response.success) {
- showAlert("success", "glyphicon glyphicon-trash", "Successfully deleted domain", domain);
+ utils.showAlert(
+ "success",
+ "glyphicon glyphicon-trash",
+ "Successfully deleted " + domain_regex,
+ domain
+ );
table
.row(tr)
.remove()
.draw(false);
- } else showAlert("error", "", "Error while deleting domain with ID " + id, response.message);
+ } else {
+ utils.showAlert(
+ "error",
+ "",
+ "Error while deleting " + domain_regex + " with ID " + id,
+ response.message
+ );
+ }
},
error: function(jqXHR, exception) {
- showAlert("error", "", "Error while deleting domain with ID " + id, jqXHR.responseText);
+ utils.enableAll();
+ utils.showAlert(
+ "error",
+ "",
+ "Error while deleting " + domain_regex + " with ID " + id,
+ jqXHR.responseText
+ );
console.log(exception);
}
});
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index 2ea23c5b..6210acbd 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -5,74 +5,10 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
-/* global moment:false */
+/* global utils:false */
var table;
var token = $("#token").html();
-var info = null;
-
-function showAlert(type, icon, title, message) {
- var opts = {};
- title = " " + title + " Error, something went wrong! ' +
'' +
- '' +
- entry.domain +
- comment +
- disabled_message +
- " " +
- '' +
- ' '
- );
- // Handle button
- $(button + " #" + index).on("click", "button", function() {
- sub(index, entry.domain, type);
- });
-}
-
-function refresh(fade) {
- var list = $("#list");
- var listw = $("#list-regex");
- if (fade) {
- list.fadeOut(100);
- listw.fadeOut(100);
- }
-
- $.ajax({
- url: "scripts/pi-hole/php/get.php",
- method: "get",
- data: { list: listType },
- success: function(response) {
- list.html("");
- listw.html("");
-
- if (
- (listType === "black" &&
- response.blacklist.length === 0 &&
- response.regex_blacklist.length === 0) ||
- (listType === "white" &&
- response.whitelist.length === 0 &&
- response.regex_whitelist.length === 0)
- ) {
- $("h3").hide();
- list.html(
- 'Your ' + fullName + " is empty!
"
- );
- } else {
- var data, data2;
- if (listType === "white") {
- data = response.whitelist.sort();
- data2 = response.regex_whitelist.sort();
- } else if (listType === "black") {
- data = response.blacklist.sort();
- data2 = response.regex_blacklist.sort();
- }
-
- if (data.length > 0) {
- $("#h3-exact").fadeIn(100);
- }
-
- if (data2.length > 0) {
- $("#h3-regex").fadeIn(100);
- }
-
- data.forEach(function(entry, index) {
- addListEntry(entry, index, list, "#list", "exact");
- });
- data2.forEach(function(entry, index) {
- addListEntry(entry, index, listw, "#list-regex", listType + "_regex");
- });
- }
-
- list.fadeIn(100);
- listw.fadeIn(100);
- },
- error: function() {
- $("#alFailure").show();
- }
- });
-}
-
-window.addEventListener("load", refresh(false));
-
-function sub(index, entry, arg) {
- var list = "#list";
- var heading = "#h3-exact";
- var locallistType = listType;
- if (arg === "black_regex" || arg === "white_regex") {
- list = "#list-regex";
- heading = "#h3-regex";
- locallistType = arg;
- }
-
- var alInfo = $("#alInfo");
- var alSuccess = $("#alSuccess");
- var alFailure = $("#alFailure");
- var err = $("#err");
- var msg = $("#success-message");
-
- var domain = $(list + " #" + index);
- domain.hide("highlight");
- $.ajax({
- url: "scripts/pi-hole/php/sub.php",
- method: "post",
- data: { domain: entry, list: locallistType, token: token },
- success: function(response) {
- if (response.indexOf("Success") === -1) {
- alFailure.show();
- err.html(response);
- alFailure.delay(8000).fadeOut(2000, function() {
- alFailure.hide();
- });
- alInfo.delay(8000).fadeOut(2000, function() {
- alInfo.hide();
- });
- } else {
- alSuccess.show();
- msg.html(response);
- alSuccess.delay(1000).fadeOut(2000, function() {
- alSuccess.hide();
- });
- alInfo.delay(1000).fadeOut(2000, function() {
- alInfo.hide();
- });
- domain.remove();
- if ($(list + " li").length === 0) {
- $(heading).fadeOut(100);
- }
- }
- },
- error: function() {
- alert("Failed to remove the domain!");
- domain.show({ queue: true });
- }
- });
-}
-
-function add(type) {
- var domain = $("#domain");
- if (domain.val().length === 0) {
- return;
- }
-
- var comment = $("#comment");
-
- var alInfo = $("#alInfo");
- var alSuccess = $("#alSuccess");
- var alFailure = $("#alFailure");
- var alWarning = $("#alWarning");
- var err = $("#err");
- var msg = $("#success-message");
- alInfo.show();
- alSuccess.hide();
- alFailure.hide();
- alWarning.hide();
- $.ajax({
- url: "scripts/pi-hole/php/add.php",
- method: "post",
- data: { domain: domain.val().trim(), comment: comment.val(), list: type, token: token },
- success: function(response) {
- if (response.indexOf("Success") === -1) {
- alFailure.show();
- err.html(response);
- alFailure.delay(8000).fadeOut(2000, function() {
- alFailure.hide();
- });
- alInfo.delay(8000).fadeOut(2000, function() {
- alInfo.hide();
- });
- } else {
- alSuccess.show();
- msg.html(response);
- alSuccess.delay(1000).fadeOut(2000, function() {
- alSuccess.hide();
- });
- alInfo.delay(1000).fadeOut(2000, function() {
- alInfo.hide();
- });
- domain.val("");
- comment.val("");
- refresh(true);
- }
- },
- error: function() {
- alFailure.show();
- err.html("");
- alFailure.delay(1000).fadeOut(2000, function() {
- alFailure.hide();
- });
- alInfo.delay(1000).fadeOut(2000, function() {
- alInfo.hide();
- });
- }
- });
-}
-
-// Handle enter button for adding domains
-$(document).keypress(function(e) {
- if (e.which === 13 && $("#domain,#comment").is(":focus")) {
- // Enter was pressed, and the input has focus
- add(listType);
- }
-});
-
-// Handle buttons
-$("#btnAdd").on("click", function() {
- add(listType);
-});
-
-$("#btnAddWildcard").on("click", function() {
- add(listType + "_wild");
-});
-
-$("#btnAddRegex").on("click", function() {
- add(listType + "_regex");
-});
-
-$("#btnRefresh").on("click", function() {
- refresh(true);
-});
-
-// Handle hiding of alerts
-$(function() {
- $("[data-hide]").on("click", function() {
- $(this)
- .closest("." + $(this).attr("data-hide"))
- .hide();
- });
-});
-
-// Wrap form-group's buttons to next line when viewed on a small screen
-$(window).on("resize", function() {
- if ($(window).width() < 991) {
- $(".form-group.input-group")
- .removeClass("input-group")
- .addClass("input-group-block");
- $(".form-group.input-group-block > input").css("margin-bottom", "5px");
- $(".form-group.input-group-block > .input-group-btn")
- .removeClass("input-group-btn")
- .addClass("btn-block text-center");
- } else {
- $(".form-group.input-group-block")
- .removeClass("input-group-block")
- .addClass("input-group");
- $(".form-group.input-group > input").css("margin-bottom", "");
- $(".form-group.input-group > .btn-block.text-center")
- .removeClass("btn-block text-center")
- .addClass("input-group-btn");
- }
-});
-$(document).ready(function() {
- $(window).trigger("resize");
-});
diff --git a/scripts/pi-hole/js/network.js b/scripts/pi-hole/js/network.js
index 2320dfcd..6203d81d 100644
--- a/scripts/pi-hole/js/network.js
+++ b/scripts/pi-hole/js/network.js
@@ -101,16 +101,22 @@ $(document).ready(function() {
// Set number of queries to localized string (add thousand separators)
$("td:eq(6)", row).html(data.numQueries.toLocaleString());
- var ips = data.ip;
- var shortips = ips;
- if (ips.length > MAXIPDISPLAY) {
- shortips = ips.slice(0, MAXIPDISPLAY - 1);
- shortips.push("...");
+ var ips = [];
+ var maxiter = Math.min(data.ip.length, MAXIPDISPLAY);
+ for (var index = 0; index < maxiter; index++) {
+ var ip = data.ip[index];
+ ips.push('' + ip + " ");
}
- $("td:eq(0)", row).html(shortips.join(" class="active">
-
+
Whitelist
class="active">
-
+
Blacklist
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index a7524b77..8ab0922a 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -35,7 +35,7 @@ function istrue(&$argument) {
// Credit: http://stackoverflow.com/a/4694816/2087442
function validDomain($domain_name)
{
- $validChars = preg_match("/^([_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([a-z\d])*)*$/i", $domain_name);
+ $validChars = preg_match("/^([_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([_a-z\d])*)*$/i", $domain_name);
$lengthCheck = preg_match("/^.{1,253}$/", $domain_name);
$labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name);
return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label
@@ -44,7 +44,7 @@ function validDomain($domain_name)
function validDomainWildcard($domain_name)
{
// There has to be either no or at most one "*" at the beginning of a line
- $validChars = preg_match("/^((\*.)?[_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([a-z\d])*)*$/i", $domain_name);
+ $validChars = preg_match("/^((\*.)?[_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([_a-z\d])*)*$/i", $domain_name);
$lengthCheck = preg_match("/^.{1,253}$/", $domain_name);
$labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name);
return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
deleted file mode 100644
index cdee3ceb..00000000
--- a/scripts/pi-hole/php/sub.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 7c34c47f..84f96bc8 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -185,7 +185,7 @@ function archive_restore_table($file, $table, $flush=false)
/**
* Create table rows from an uploaded archive file
*
- * @param $file object The file of the file in the archive to import
+ * @param $file object The file in the archive to import
* @param $table string The target table
* @param $flush boolean Whether to flush the table before importing the archived data
* @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
@@ -193,22 +193,69 @@ function archive_restore_table($file, $table, $flush=false)
*/
function archive_insert_into_table($file, $table, $flush=false, $wildcardstyle=false)
{
- global $db, $flushed_tables;
+ global $db;
$domains = array_filter(explode("\n",file_get_contents($file)));
// Return early if we cannot extract the lines in the file
if(is_null($domains))
return 0;
- // Flush table if requested, only flush each table once
- if($flush && !in_array($table, $flushed_tables))
- {
- $db->exec("DELETE FROM ".$table);
- array_push($flushed_tables, $table);
+ // Generate comment
+ $prefix = "phar:///tmp/";
+ if (substr($file, 0, strlen($prefix)) == $prefix) {
+ $file = substr($file, strlen($prefix));
+ }
+ $comment = "Imported from ".$file;
+
+ // Determine table and type to import to
+ $type = null;
+ if($table === "whitelist") {
+ $table = "domainlist";
+ $type = ListType::whitelist;
+ } else if($table === "blacklist") {
+ $table = "domainlist";
+ $type = ListType::blacklist;
+ } else if($table === "regex_blacklist") {
+ $table = "domainlist";
+ $type = ListType::regex_blacklist;
+ } else if($table === "domain_audit") {
+ $table = "domain_audit";
+ $type = -1; // -1 -> not used inside add_to_table()
+ } else if($table === "adlist") {
+ $table = "adlist";
+ $type = -1; // -1 -> not used inside add_to_table()
+ }
+
+ // Flush table if requested
+ if($flush) {
+ flush_table($table, $type);
}
// Add domains to requested table
- return add_to_table($db, $table, $domains, $wildcardstyle, true);
+ return add_to_table($db, $table, $domains, $comment, $wildcardstyle, true, $type);
+}
+
+/**
+ * Flush table if requested. This subroutine flushes each table only once
+ *
+ * @param $table string The target table
+ * @param $type integer Type of item to flush in table (applies only to domainlist table)
+ */
+function flush_table($table, $type=null)
+{
+ global $db, $flushed_tables;
+
+ if(!in_array($table, $flushed_tables))
+ {
+ if($type !== null) {
+ $sql = "DELETE FROM ".$table." WHERE type = ".$type;
+ array_push($flushed_tables, $table.$type);
+ } else {
+ $sql = "DELETE FROM ".$table;
+ array_push($flushed_tables, $table);
+ }
+ $db->exec($sql);
+ }
}
function archive_add_directory($path,$subdir="")
@@ -311,7 +358,14 @@ if(isset($_POST["action"]))
if(isset($_POST["auditlog"]) && $file->getFilename() === "auditlog.list")
{
$num = archive_insert_into_table($file, "domain_audit", $flushtables);
- echo "Processed blacklist (regex) (".$num." entries)