From 9df5301f5d2b46e31dc1ef33b80f5f26fccb5f1e Mon Sep 17 00:00:00 2001
From: quenousimporte <quenousimporte@riseup.net>
Date: Mon, 17 Jul 2023 09:16:10 +0200
Subject: [PATCH] fixed: ics file not found refactor: removed commented code
 changed: server data file name changed: pgp is required in remote mode
 refactor: added function to get or create note

---
 handler.php  |  2 +-
 main.js      | 77 ++++++++++++++++++++++++++++++----------------------
 settings.php |  2 +-
 style.css    |  4 ---
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/handler.php b/handler.php
index 397b0a3..f4d6bc2 100644
--- a/handler.php
+++ b/handler.php
@@ -41,7 +41,7 @@ else if (isset($_POST['action']))
 		break;
 
 		case 'cal':
-			if (file_exists($icsfile))
+			if ($icsfile)
 			{
 				$result = array();
 				$result["ics"] = file_get_contents($icsfile);
diff --git a/main.js b/main.js
index ebd3f47..3a5327a 100644
--- a/main.js
+++ b/main.js
@@ -1242,14 +1242,23 @@ function init()
 
 	if (isremote())
 	{
-		queryremote({action: "fetch"})
-		.then(data =>
+		if (localStorage.getItem("pgpkeys") && localStorage.getItem("pgpkeys").startsWith("-----BEGIN PGP PUBLIC KEY BLOCK-----"))
 		{
-			window.localStorage.setItem("remote", JSON.stringify(data));
+			queryremote({action: "fetch"})
+			.then(data =>
+			{
+				window.localStorage.setItem("remote", JSON.stringify(data));
+				loadstorage();
+				checkevents();
+			})
+			.catch(remotecallfailed);
+		}
+		else
+		{
+			showtemporaryinfo("Pgp key empty or invalid. Switching to local.");
+			currentvault = "local";
 			loadstorage();
-			checkevents();
-		})
-		.catch(remotecallfailed);
+		}
 	}
 	else
 	{
@@ -1323,6 +1332,23 @@ function ics2json(ics)
 	return events.sort( (a,b) => a.DTSTART - b.DTSTART);
 }
 
+function getorcreate(title, content, putontop)
+{
+	var note = getnote(title);
+	if (!note)
+	{
+		note = {title: title, content: content};
+		localdata.push(note)
+	}
+
+	if (putontop)
+	{
+		localdata.splice(localdata.indexOf(note), 1);
+		localdata.unshift(note);
+	}
+	return note;
+}
+
 function checkevents()
 {
 	queryremote({action: "cal"})
@@ -1340,16 +1366,7 @@ function checkevents()
 			return;
 		}
 
-		var note = getnote("events.json");
-		if (!note)
-		{
-			note = {
-				title: "events.json",
-				content: "[]"
-			};
-			localdata.push(note);
-		}
-
+		var note = getorcreate("events.json", "[]", false);
 		var events = ics2json(data.ics);
 		var existing = JSON.parse(note.content).map(e =>
 			{
@@ -1387,21 +1404,21 @@ function checkevents()
 		if (newcontent.length)
 		{
 			showtemporaryinfo("Calendar changes to check");
-			var todo = getnote("todo");
+			var eventsnotes = getorcreate("events to check", "", true);
 			var idx = 0;
-			if (todo.content.startsWith("---"))
+			if (eventsnotes.content.startsWith("---"))
 			{
-				idx = todo.content.indexOf("---", 3) + 4;
+				idx = eventsnotes.content.indexOf("---", 3) + 4;
 			}
-			todo.content = todo.content.substring(0, idx)
+			eventsnotes.content = eventsnotes.content.substring(0, idx)
 			+ newcontent.join("\n")
 			+ "\n---\n"
-			+ todo.content.substring(idx);
+			+ eventsnotes.content.substring(idx);
 
-			// reload todo if open
-			if (currentnote == todo)
+			// reload eventsnotes if open
+			if (currentnote == eventsnotes)
 			{
-				bindfile(todo);
+				bindfile(eventsnotes);
 			}
 
 			note.content = JSON.stringify(events);
@@ -2123,7 +2140,7 @@ function toggleheader()
 {
 	if (preview.hidden)
 	{
-		if (md.value.startsWith("---"))
+		if (md.value.startsWith("---\n"))
 		{
 			var idx = md.value.indexOf("---", 3);
 			var header = md.value.substring(0, idx + 4);
@@ -2467,7 +2484,7 @@ function bindfile(note)
 	}
 
 	currentheader = "";
-	if (settings.hideheaderbydefault && md.value.startsWith("---"))
+	if (settings.hideheaderbydefault && md.value.startsWith("---\n"))
 	{
 		toggleheader();
 	}
@@ -2477,13 +2494,7 @@ function bindfile(note)
 
 function loadnote(name)
 {
-	var note = localdata.find(n => n.title == name);
-	if (!note)
-	{
-		note = {title: name, content: ""};
-		localdata.unshift(note);
-	}
-
+	var note = getorcreate(name, "", true);
 	bindfile(note);
 
 	stat.cur.q = 0;
diff --git a/settings.php b/settings.php
index 8a2ef0a..741b1e4 100644
--- a/settings.php
+++ b/settings.php
@@ -1,5 +1,5 @@
 <?php
-	$datafile = '../data/data.json';
+	$datafile = '../data/data.acs';
 	$icsfile = '';
 	$password = '';
 	$smsurl = '';
diff --git a/style.css b/style.css
index 037e08c..737b59a 100644
--- a/style.css
+++ b/style.css
@@ -89,10 +89,6 @@ body::-webkit-scrollbar-thumb {
 
 #filter {
 	width: 100%;
-
-	/* wm style
-	background-color: #f0f0f0;
-	*/
 }
 
 #searchdialog {