From 43c8ede674aba2a492025a6f74d214388a4698e4 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 13 Oct 2023 09:44:01 +0200 Subject: [PATCH] Add "processData: false" to all JSON data we send Signed-off-by: DL6ER --- scripts/pi-hole/js/footer.js | 2 ++ scripts/pi-hole/js/groups-adlists.js | 2 ++ scripts/pi-hole/js/groups-clients.js | 2 ++ scripts/pi-hole/js/groups-domains.js | 2 ++ scripts/pi-hole/js/groups.js | 2 ++ scripts/pi-hole/js/login.js | 2 ++ scripts/pi-hole/js/settings-api.js | 2 ++ scripts/pi-hole/js/settings-system.js | 2 ++ scripts/pi-hole/js/settings.js | 2 ++ scripts/pi-hole/js/utils.js | 1 + 10 files changed, 19 insertions(+) diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 70bc1d39..289f104c 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -119,6 +119,8 @@ function piholeChange(action, duration) { $.ajax({ url: "/api/dns/blocking", method: "POST", + dataType: "json", + processData: false, data: JSON.stringify({ blocking: action === "enable", timer: parseInt(duration, 10) > 0 ? parseInt(duration, 10) : null, diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js index 84ff709c..c05a84ad 100644 --- a/scripts/pi-hole/js/groups-adlists.js +++ b/scripts/pi-hole/js/groups-adlists.js @@ -516,6 +516,7 @@ function addAdlist(event) { url: "/api/lists", method: "post", dataType: "json", + processData: false, data: JSON.stringify({ address: address, comment: comment, type: type }), success: function () { utils.enableAll(); @@ -582,6 +583,7 @@ function editAdlist() { url: "/api/lists/" + encodeURIComponent(addressDecoded), method: "put", dataType: "json", + processData: false, data: JSON.stringify({ groups: groups, comment: comment, diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js index 843be7b9..32483b4f 100644 --- a/scripts/pi-hole/js/groups-clients.js +++ b/scripts/pi-hole/js/groups-clients.js @@ -440,6 +440,7 @@ function addClient() { url: "/api/clients", method: "post", dataType: "json", + processData: false, data: JSON.stringify({ client: ip, comment: comment }), success: function () { utils.enableAll(); @@ -495,6 +496,7 @@ function editClient() { url: "/api/clients/" + encodeURIComponent(clientDecoded), method: "put", dataType: "json", + processData: false, data: JSON.stringify({ client: client, groups: groups, diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js index 1429a95a..d0f07e01 100644 --- a/scripts/pi-hole/js/groups-domains.js +++ b/scripts/pi-hole/js/groups-domains.js @@ -527,6 +527,7 @@ function addDomain() { url: "/api/domains/" + type + "/" + kind, method: "post", dataType: "json", + processData: false, data: JSON.stringify({ domain: domain, comment: comment, @@ -609,6 +610,7 @@ function editDomain() { url: "/api/domains/" + newTypestr + "/" + encodeURIComponent(domainDecoded), method: "put", dataType: "json", + processData: false, data: JSON.stringify({ groups: groups, comment: comment, diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js index 0beab5ba..fdb9ed36 100644 --- a/scripts/pi-hole/js/groups.js +++ b/scripts/pi-hole/js/groups.js @@ -294,6 +294,7 @@ function addGroup() { url: "/api/groups", method: "post", dataType: "json", + processData: false, data: JSON.stringify({ name: name, comment: comment, @@ -360,6 +361,7 @@ function editGroup() { url: "/api/groups/" + oldName, method: "put", dataType: "json", + processData: false, data: JSON.stringify({ name: name, comment: comment, diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js index 3f402841..ef1ff70f 100644 --- a/scripts/pi-hole/js/login.js +++ b/scripts/pi-hole/js/login.js @@ -60,6 +60,8 @@ function doLogin(password) { $.ajax({ url: "/api/auth", method: "POST", + dataType: "json", + processData: false, data: JSON.stringify({ password: password, totp: parseInt($("#totp").val(), 10) }), }) .done(function () { diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index b0e4fea2..d2e80cc8 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -318,6 +318,8 @@ function setTOTPSecret(secret) { $.ajax({ url: "/api/config", type: "PATCH", + dataType: "json", + processData: false, data: JSON.stringify({ config: { webserver: { api: { totp_secret: secret } } } }), contentType: "application/json", }) diff --git a/scripts/pi-hole/js/settings-system.js b/scripts/pi-hole/js/settings-system.js index a7f8b425..c7f5c647 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 6922cdbb..17d28f40 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -137,6 +137,8 @@ function saveSettings() { $.ajax({ url: "/api/config", method: "PATCH", + dataType: "json", + processData: false, data: JSON.stringify({ config: settings }), contentType: "application/json; charset=utf-8", }) diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js index cbeb6304..b0795ff1 100644 --- a/scripts/pi-hole/js/utils.js +++ b/scripts/pi-hole/js/utils.js @@ -315,6 +315,7 @@ function addFromQueryLog(domain, list) { url: "/api/domains/" + list + "/exact", method: "post", dataType: "json", + processData: false, data: JSON.stringify({ domain: domain, comment: "Added from Query Log",