From 1ca54f39f8d3a2fe19a23aa888ef59a32f84ca11 Mon Sep 17 00:00:00 2001 From: parhedberg Date: Mon, 5 Dec 2022 20:43:06 +0100 Subject: [PATCH] Using named cookies to get a correct redirect (#1492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Using named cookies * Prevent from deleting wlan.ini file * Missed " * Revert "Prevent from deleting wlan.ini file" This reverts commit 901b6998b6461e1014c49bd1023366c93c1ad662. Co-authored-by: Pär Hedberg --- sd-card/html/index.html | 24 ++++++++++++++++++++---- sd-card/html/ota_page.html | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sd-card/html/index.html b/sd-card/html/index.html index c13577ac..fa8baf89 100644 --- a/sd-card/html/index.html +++ b/sd-card/html/index.html @@ -28,6 +28,22 @@ el.style.visibility = 'visible'; }); } + + function getCookie(cname) { + let name = cname + "="; + let decodedCookie = decodeURIComponent(document.cookie); + let ca = decodedCookie.split(';'); + for(let i = 0; i @@ -88,11 +104,11 @@ LoadFwVersion(); LoadWebUiVersion(); - if (document.cookie == "" || document.cookie == "reboot_page.html") { - document.cookie = "overview.html"; + if (getCookie("page") == "" || getCookie("page") == "reboot_page.html") { + document.cookie = "page=overview.html"; } - console.log("Loading page: " + document.cookie); - document.getElementById('maincontent').src = document.cookie; + console.log("Loading page: " + getCookie("page")); + document.getElementById('maincontent').src = getCookie("page"); diff --git a/sd-card/html/ota_page.html b/sd-card/html/ota_page.html index 5a87d44e..eb58743d 100644 --- a/sd-card/html/ota_page.html +++ b/sd-card/html/ota_page.html @@ -210,7 +210,7 @@ function extract() { document.getElementById("status").innerText = "Status: Update completed!"; document.getElementById("doUpdate").disabled = true; document.getElementById("newfile").disabled = false; - document.cookie = "overview.html"; // Make sure after the reboot we go to the overview page + document.cookie = "page=overview.html"; // Make sure after the reboot we go to the overview page if (xhttp.responseText.startsWith("reboot")) {