diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 6cd7bfba4..289f104c9 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -120,10 +120,11 @@ function piholeChange(action, duration) { url: "/api/dns/blocking", method: "POST", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ blocking: action === "enable", timer: parseInt(duration, 10) > 0 ? parseInt(duration, 10) : null, - }, + }), }) .done(function (data) { if (data.blocking === action + "d") { diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js index 624972b3c..c05a84ad3 100644 --- a/scripts/pi-hole/js/groups-adlists.js +++ b/scripts/pi-hole/js/groups-adlists.js @@ -516,7 +516,8 @@ function addAdlist(event) { url: "/api/lists", method: "post", dataType: "json", - data: { address: address, comment: comment, type: type }, + processData: false, + data: JSON.stringify({ address: address, comment: comment, type: type }), success: function () { utils.enableAll(); utils.showAlert("success", "fas fa-plus", "Successfully added " + type + "list", address); @@ -582,12 +583,13 @@ function editAdlist() { url: "/api/lists/" + encodeURIComponent(addressDecoded), method: "put", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ groups: groups, comment: comment, enabled: enabled, type: type, - }, + }), success: function () { utils.enableAll(); utils.showAlert( diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js index 6a7aecefa..32483b4f9 100644 --- a/scripts/pi-hole/js/groups-clients.js +++ b/scripts/pi-hole/js/groups-clients.js @@ -440,7 +440,8 @@ function addClient() { url: "/api/clients", method: "post", dataType: "json", - data: { client: ip, comment: comment }, + processData: false, + data: JSON.stringify({ client: ip, comment: comment }), success: function () { utils.enableAll(); utils.showAlert("success", "fas fa-plus", "Successfully added client", ip); @@ -495,12 +496,13 @@ function editClient() { url: "/api/clients/" + encodeURIComponent(clientDecoded), method: "put", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ client: client, groups: groups, comment: comment, enabled: enabled, - }, + }), success: function () { utils.enableAll(); utils.showAlert( diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js index 8158caf88..d0f07e01e 100644 --- a/scripts/pi-hole/js/groups-domains.js +++ b/scripts/pi-hole/js/groups-domains.js @@ -527,12 +527,13 @@ function addDomain() { url: "/api/domains/" + type + "/" + kind, method: "post", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ domain: domain, comment: comment, type: type, kind: kind, - }, + }), success: function () { utils.enableAll(); utils.showAlert("success", "fas fa-plus", "Successfully added domain", domain); @@ -609,13 +610,14 @@ function editDomain() { url: "/api/domains/" + newTypestr + "/" + encodeURIComponent(domainDecoded), method: "put", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ groups: groups, comment: comment, enabled: enabled, type: oldType, kind: oldKind, - }, + }), success: function () { utils.enableAll(); utils.showAlert( diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js index 5e8f99303..fdb9ed360 100644 --- a/scripts/pi-hole/js/groups.js +++ b/scripts/pi-hole/js/groups.js @@ -294,11 +294,12 @@ function addGroup() { url: "/api/groups", method: "post", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ name: name, comment: comment, enabled: true, - }, + }), success: function () { utils.enableAll(); utils.showAlert("success", "fas fa-plus", "Successfully added group", name); @@ -360,11 +361,12 @@ function editGroup() { url: "/api/groups/" + oldName, method: "put", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ name: name, comment: comment, enabled: enabled, - }, + }), success: function () { utils.enableAll(); utils.showAlert("success", "fas fa-pencil-alt", "Successfully " + done + " group", oldName); diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js index 4dc518f47..ef1ff70fa 100644 --- a/scripts/pi-hole/js/login.js +++ b/scripts/pi-hole/js/login.js @@ -61,7 +61,8 @@ function doLogin(password) { url: "/api/auth", method: "POST", dataType: "json", - data: { password: password, totp: parseInt($("#totp").val(), 10) }, + processData: false, + data: JSON.stringify({ password: password, totp: parseInt($("#totp").val(), 10) }), }) .done(function () { wrongPassword(false, true); diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index 6bb17f678..d2e80cc8a 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -319,7 +319,8 @@ function setTOTPSecret(secret) { url: "/api/config", type: "PATCH", dataType: "json", - data: { config: { webserver: { api: { totp_secret: secret } } } }, + processData: false, + data: JSON.stringify({ config: { webserver: { api: { totp_secret: secret } } } }), contentType: "application/json", }) .done(function () { diff --git a/scripts/pi-hole/js/settings-system.js b/scripts/pi-hole/js/settings-system.js index a7f8b4256..c7f5c6477 100644 --- a/scripts/pi-hole/js/settings-system.js +++ b/scripts/pi-hole/js/settings-system.js @@ -290,6 +290,8 @@ $("#loggingButton").confirm({ $.ajax({ url: "/api/config/dns/queryLogging", type: "PATCH", + dataType: "json", + processData: false, data: JSON.stringify(data), }) .done(function (data) { diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index b7ef7265e..17d28f406 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -138,7 +138,8 @@ function saveSettings() { url: "/api/config", method: "PATCH", dataType: "json", - data: { config: settings }, + processData: false, + data: JSON.stringify({ config: settings }), contentType: "application/json; charset=utf-8", }) .done(function () { diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js index 530725ab0..b0795ff1b 100644 --- a/scripts/pi-hole/js/utils.js +++ b/scripts/pi-hole/js/utils.js @@ -315,12 +315,13 @@ function addFromQueryLog(domain, list) { url: "/api/domains/" + list + "/exact", method: "post", dataType: "json", - data: { + processData: false, + data: JSON.stringify({ domain: domain, comment: "Added from Query Log", type: list, kind: "exact", - }, + }), success: function (response) { alProcessing.hide(); if ("domains" in response && response.domains.length > 0) {