Using named cookies to get a correct redirect (#1492)

* Using named cookies * Prevent from deleting wlan.ini file * Missed " * Revert "Prevent from deleting wlan.ini file" This reverts commit 901b699. Co-authored-by: Pär Hedberg <[email protected]>
jomjol · Dec 5, 2022 · 1ca54f3 · 1ca54f3
1 parent 5867e90
commit 1ca54f3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git 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 <ca.length; i++) {
+        let c = ca[i];
+        while (c.charAt(0) == ' ') {
+          c = c.substring(1);
+        }
+        if (c.indexOf(name) == 0) {
+          return c.substring(name.length, c.length);
+        }
+      }
+      return "";
+    }        
 </script>
 
 </head>
@@ -88,11 +104,11 @@ <h2>An ESP32 all inclusive neural network recognition system for meter digitaliz
   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");
 </script>
 
 </div>

diff --git a/sd-card/html/ota_page.html b/sd-card/html/ota_page.html
@@ -210,7 +210,7 @@ <h3><span id="status">Status: idle</span> <span id="progress"></span></h3>
                 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"))
                 {