Skip to content

Commit

Permalink
Fix AJAX JSON data (#2744)
Browse files Browse the repository at this point in the history
  • Loading branch information
yubiuser authored Oct 13, 2023
2 parents 2fbef7f + 43c8ede commit 6c3d45c
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 21 deletions.
5 changes: 3 additions & 2 deletions scripts/pi-hole/js/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
8 changes: 5 additions & 3 deletions scripts/pi-hole/js/groups-adlists.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 5 additions & 3 deletions scripts/pi-hole/js/groups-clients.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 6 additions & 4 deletions scripts/pi-hole/js/groups-domains.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 6 additions & 4 deletions scripts/pi-hole/js/groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion scripts/pi-hole/js/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion scripts/pi-hole/js/settings-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
2 changes: 2 additions & 0 deletions scripts/pi-hole/js/settings-system.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion scripts/pi-hole/js/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
5 changes: 3 additions & 2 deletions scripts/pi-hole/js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 6c3d45c

Please sign in to comment.