From a7eed9b41d9992e634593da529b1e26f97f98603 Mon Sep 17 00:00:00 2001
From: fyr77 <login@notjakob.com>
Date: Tue, 9 Mar 2021 12:31:58 +0100
Subject: [PATCH] fix #11

---
 js/finalize.js | 6 +++---
 js/tool.js     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/finalize.js b/js/finalize.js
index 8b87b1a..abac750 100644
--- a/js/finalize.js
+++ b/js/finalize.js
@@ -33,7 +33,7 @@ function buildList() {
 
             var headertext = document.createElement("h3");
             headertext.classList.add("w3-left");
-            headertext.appendChild(document.createTextNode(getCookie(i + "provName")));
+            headertext.appendChild(document.createTextNode(decodeURIComponent(getCookie(i + "provName"))));
 
             var headerdel = document.createElement("button");
             headerdel.classList.add("w3-button");
@@ -60,7 +60,7 @@ function buildList() {
             var dns2v4 = getCookie(i + "dns2v4");
             var dns1v6 = getCookie(i + "dns1v6");
             var dns2v6 = getCookie(i + "dns2v6");
-            var exclWifi = getCookie(i + "exclWifi");
+            var exclWifi = decodeURIComponent(getCookie(i + "exclWifi"));
 
             if (dns1v4 != "") {
                 infostring = "Primary IPv4 DNS Server: " + getCookie(i + "dns1v4");
@@ -211,7 +211,7 @@ function saveDynamicDataToFile() {
             } else {
                 encValue = "TLS";
             }
-            var exclWifi = getCookie(i + "exclWifi")
+            var exclWifi = decodeURIComponent(getCookie(i + "exclWifi"));
 
             fileString += "<dict>\n";
             fileString += "<key>DNSSettings</key>\n";
diff --git a/js/tool.js b/js/tool.js
index 2a4e58e..2e7ba96 100644
--- a/js/tool.js
+++ b/js/tool.js
@@ -23,14 +23,14 @@ function addToList() {
     var d = new Date();
     d.setTime(d.getTime() + (86400000)); //expires in 24h
     var expires = "expires="+ d.toUTCString();
-    document.cookie = runningNo + "provName=" + document.getElementById("provName").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
+    document.cookie = runningNo + "provName=" + encodeURIComponent(document.getElementById("provName").value) + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "doh=" + document.getElementById("doh").checked + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "dns1v4=" + document.getElementById("dns1v4").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "dns2v4=" + document.getElementById("dns2v4").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "dns1v6=" + document.getElementById("dns1v6").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "dns2v6=" + document.getElementById("dns2v6").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "serverUrl=" + document.getElementById("serverUrl").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
-    document.cookie = runningNo + "exclWifi=" + document.getElementById("exclWifi").value + ";" + expires + ";path=/; SameSite=Strict; Secure";
+    document.cookie = runningNo + "exclWifi=" + encodeURIComponent(document.getElementById("exclWifi").value) + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "useWifi=" + document.getElementById("useWifi").checked + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "useCell=" + document.getElementById("useCell").checked + ";" + expires + ";path=/; SameSite=Strict; Secure";
     document.cookie = runningNo + "lockProfile=" + document.getElementById("lockProfile").checked + ";" + expires + ";path=/; SameSite=Strict; Secure";