From 34ac045d6c433d03ee84f659a96ff4e772c345dc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 15 Nov 2021 10:51:03 +0000 Subject: [PATCH] Switch to event id to avoid confusion with other links --- content.py | 2 +- daemon.py | 4 ++-- webapp_calendar.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content.py b/content.py index 3cd45b6bc..f409d43e0 100644 --- a/content.py +++ b/content.py @@ -1277,7 +1277,7 @@ def containsInvalidLocalLinks(content: str) -> bool: invalidStrings = ( 'mute', 'unmute', 'editeventpost', 'notifypost', 'delete', 'options', 'page', 'repeat', - 'bm', 'tl', 'actor', 'unrepeat', + 'bm', 'tl', 'actor', 'unrepeat', 'eventid', 'unannounce', 'like', 'unlike', 'bookmark', 'unbookmark', 'likedBy', 'time', 'year', 'month', 'day', 'editnewpost', diff --git a/daemon.py b/daemon.py index 07c92b2f9..c68801575 100644 --- a/daemon.py +++ b/daemon.py @@ -12464,7 +12464,7 @@ class PubServer(BaseHTTPRequestHandler): GETstartTime) -> bool: """Confirm whether to delete a calendar event """ - postId = path.split('?id=')[1] + postId = path.split('?eventid=')[1] if '?' in postId: postId = postId.split('?')[0] postTime = path.split('?time=')[1] @@ -14766,7 +14766,7 @@ class PubServer(BaseHTTPRequestHandler): if htmlGET and usersInPath: if '/eventdelete' in self.path and \ '?time=' in self.path and \ - '?id=' in self.path: + '?eventid=' in self.path: if self._confirmDeleteEvent(callingDomain, self.path, self.server.baseDir, self.server.httpPrefix, diff --git a/webapp_calendar.py b/webapp_calendar.py index 7e7fe2a1e..c20a5f35b 100644 --- a/webapp_calendar.py +++ b/webapp_calendar.py @@ -188,7 +188,7 @@ def _htmlCalendarDay(personCache: {}, cssCache: {}, translate: {}, if postId: deleteButtonStr = \ '\n