kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-07-30 16:59:15 +02:00
Code Issues Activity

security fixes, bugfixes

Browse Source
This commit is contained in:
Marek Farkaš
2025-01-16 21:39:09 +01:00
parent d0a8fbaf81
commit 20864c572b
10 changed files with 67 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/js/confighandler.js
+7 -14
View File
@@ -38,22 +38,14 @@ function fetchConfig() {
function populateFields(data, prefix = "") {
$.each(data, (key, value) => {
if (key === "presets" && Array.isArray(value)) {
value.forEach((item, index) => {
const presetId = `${prefix}${prefix ? "-" : ""}${key}-${index + 1}`;
const $element = $(`#${presetId}`);
if ($element.length) {
$element.val(item);
}
});
return;
if (value === null) {
value = ""; // Convert null to an empty string
}
const id = `${prefix}${prefix ? "-" : ""}${key}`;
const $element = $(`#${id}`);
if (typeof value === "object" && !Array.isArray(value)) {
if (typeof value === "object" && value !== null && !Array.isArray(value)) {
populateFields(value, id);
return;
}
@@ -96,7 +88,7 @@ function updateConfigData(data, prefix = "") {
while (true) {
const $presetElement = $(`#${prefix}${prefix ? "-" : ""}${key}-${index}`);
if ($presetElement.length) {
data[key].push($presetElement.val());
data[key].push($presetElement.val() || null); // Allow null if necessary
index++;
} else {
break;
@@ -117,12 +109,13 @@ function updateConfigData(data, prefix = "") {
return;
}
if (typeof value === "object" && !Array.isArray(value)) {
if (typeof value === "object" && value !== null && !Array.isArray(value)) {
return updateConfigData(value, id);
}
if ($element.length) {
data[key] = typeof value === "boolean" ? $element.is(":checked") : $element.attr("data-value") ?? $element.val();
const newValue = $element.attr("data-value") ?? $element.val() ?? null;
data[key] = typeof value === "boolean" ? $element.is(":checked") : newValue;
}
});
}