From 7d5800fd1b395028ab34ff76e1e9f5da764931f2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 23 Feb 2020 12:32:41 +0000
Subject: [PATCH] Return to calendar

---
 daemon.py       | 9 ++++++++-
 webinterface.py | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/daemon.py b/daemon.py
index b83a335d..97349f5a 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1536,7 +1536,14 @@ class PubServer(BaseHTTPRequestHandler):
                                              self.server.baseDir,self.path, \
                                              self.server.httpPrefix, \
                                              self.server.domainFull,
-                                             postId,postTime).encode()
+                                             postId,postTime)
+               if not msg:
+                   actor= \
+                       self.server.httpPrefix+'://'+self.server.domainFull+ \
+                       self.path.split('/eventdelete')[0]
+                   self._redirect_headers(actor+'/calendar',cookie)
+                   return
+               msg=msg.encode()
                self._set_headers('text/html',len(msg),cookie)
                self._write(msg)
                self.server.GETbusy=False
diff --git a/webinterface.py b/webinterface.py
index 5214cc2c..e4672103 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -3402,7 +3402,7 @@ def htmlCalendarDeleteConfirm(translate: {},baseDir: str, \
         deletePostStr+='    <input type="hidden" name="pageNumber" value="1">'
         deletePostStr+='    <input type="hidden" name="messageId" value="'+messageId+'">'
         deletePostStr+='    <button type="submit" class="button" name="submitYes">'+translate['Yes']+'</button>'
-        deletePostStr+='    <a href="'+actor+'/inbox'+'"><button class="button">'+translate['No']+'</button></a>'
+        deletePostStr+='    <a href="'+actor+'/calendar'+'"><button class="button">'+translate['No']+'</button></a>'
         deletePostStr+='  </form>'
         deletePostStr+='</center>'
         deletePostStr+=htmlFooter()