From 72974f2548755ff9d1ee2458c64e780164a18685 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 20 Oct 2018 02:07:10 +0200
Subject: [PATCH] TiddlyWiki: bugfix for Firefox Quantum -- use HTML5 web
 storage instead of a Cookie

Firefox Quantum adopted the idiotic behaviour of Chrome and does no longer
retrieve Cookies for pages read from local file system. It stores the Cookie
data into its local cookies.sqlite, but it does not retrieve it anymore.
For aledged "security reasons", however it happily retrieves HTML 5 web storage

Since TiddlyWiki classic just accesses the document.cookie at 3 points,
it is easy to patch around that problem. Just check, if we're using a modern
browser with support for HTML5 web storage and branch accordingly.
---
 wiki/empty.html        | 32 ++++++++++++++++++++++++++++----
 wiki/renderengine.html | 32 ++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/wiki/empty.html b/wiki/empty.html
index e26bb319c..21452b8f8 100644
--- a/wiki/empty.html
+++ b/wiki/empty.html
@@ -6261,6 +6261,16 @@ var loadOptionsCookie = loadOptions;
 
 function getCookies()
 {
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		var storedData = {};
+		for (var n = window.localStorage.length || 0; --n >= 0; ) {
+			var key = window.localStorage.key(n);
+			storedData[key] = window.localStorage[key];
+		}
+		return storedData;
+	}
+	// else: use old-style cookie storage
 	var cookieList = document.cookie.split(';');
 	var i,cookies = {};
 	for(i=0; i<cookieList.length; i++) {
@@ -6325,7 +6335,13 @@ var saveOptionCookie = saveOption;
 
 function removeCookie(name)
 {
-	document.cookie = name + '=; expires=Thu, 01-Jan-1970 00:00:01 UTC; path=/;';
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		window.localStorage.removeItem(name);
+	} else {
+		// use old-style cookie storage
+		document.cookie = name + '=; expires=Thu, 01-Jan-1970 00:00:01 UTC; path=/;';
+	}
 }
 
 function saveCookie(name)
@@ -6336,10 +6352,18 @@ function saveCookie(name)
 		value = value == null ? 'false' : value;
 		cookies[key] = value;
 	}
-	// TW291 and later (#159)
-	document.cookie = 'TiddlyWikiClassicOptions='
-		+ String.encodeHashMap(cookies).replace(/%/g,'%25').replace(/"/g,'%22')
+	var encodedCookie = String.encodeHashMap(cookies).replace(/%/g,'%25').replace(/"/g,'%22')
+	// Modern browsers (e.g. Firefox Quantum) do not support Cookies for file:/// anymore
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		window.localStorage.TiddlyWikiClassicOptions = encodedCookie;
+	} else {
+		// use old-style cookie storage
+		// TW291 and later (#159)
+		document.cookie = 'TiddlyWikiClassicOptions='
+		+ encodedCookie
 		+ '; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/';
+	}
 	cookies = getCookies();
 	var c;
 	for(c in cookies) {
diff --git a/wiki/renderengine.html b/wiki/renderengine.html
index 8a803c292..26a86a393 100644
--- a/wiki/renderengine.html
+++ b/wiki/renderengine.html
@@ -16006,6 +16006,16 @@ var loadOptionsCookie = loadOptions;
 
 function getCookies()
 {
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		var storedData = {};
+		for (var n = window.localStorage.length || 0; --n >= 0; ) {
+			var key = window.localStorage.key(n);
+			storedData[key] = window.localStorage[key];
+		}
+		return storedData;
+	}
+	// else: use old-style cookie storage
 	var cookieList = document.cookie.split(';');
 	var i,cookies = {};
 	for(i=0; i<cookieList.length; i++) {
@@ -16070,7 +16080,13 @@ var saveOptionCookie = saveOption;
 
 function removeCookie(name)
 {
-	document.cookie = name + '=; expires=Thu, 01-Jan-1970 00:00:01 UTC; path=/;';
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		window.localStorage.removeItem(name);
+	} else {
+		// use old-style cookie storage
+		document.cookie = name + '=; expires=Thu, 01-Jan-1970 00:00:01 UTC; path=/;';
+	}
 }
 
 function saveCookie(name)
@@ -16081,10 +16097,18 @@ function saveCookie(name)
 		value = value == null ? 'false' : value;
 		cookies[key] = value;
 	}
-	// TW291 and later (#159)
-	document.cookie = 'TiddlyWikiClassicOptions='
-		+ String.encodeHashMap(cookies).replace(/%/g,'%25').replace(/"/g,'%22')
+	var encodedCookie = String.encodeHashMap(cookies).replace(/%/g,'%25').replace(/"/g,'%22')
+	// Modern browsers (e.g. Firefox Quantum) do not support Cookies for file:/// anymore
+	if (typeof(Storage) !== "undefined") {
+		// modern browser: use HTML5 web storage
+		window.localStorage.TiddlyWikiClassicOptions = encodedCookie;
+	} else {
+		// use old-style cookie storage
+		// TW291 and later (#159)
+		document.cookie = 'TiddlyWikiClassicOptions='
+		+ encodedCookie
 		+ '; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/';
+	}
 	cookies = getCookies();
 	var c;
 	for(c in cookies) {