From dffe45afda165e80ca2ac4043e28b19b3d3ea3cc Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 31 Jul 2019 10:00:44 +0100
Subject: [PATCH] Link follow confirmation to search screen

---
 daemon.py       |  3 ++-
 webinterface.py | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/daemon.py b/daemon.py
index da53f0b81..ac28fd97e 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1363,7 +1363,8 @@ class PubServer(BaseHTTPRequestHandler):
             return
 
         # remove any trailing slashes from the path
-        self.path=self.path.replace('/outbox/','/outbox').replace('/inbox/','/inbox').replace('/shares/','/shares').replace('/sharedInbox/','/sharedInbox')
+        if not self.path.endswith('confirm'):
+            self.path=self.path.replace('/outbox/','/outbox').replace('/inbox/','/inbox').replace('/shares/','/shares').replace('/sharedInbox/','/sharedInbox')
 
         cookie=None
         if self.headers.get('Cookie'):
diff --git a/webinterface.py b/webinterface.py
index 75923b411..77175bf5c 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -768,6 +768,12 @@ def htmlProfileAfterSearch(baseDir: str,path: str,httpPrefix: str, \
 
         profileStyle = cssFile.read().replace('image.png',profileBackgroundImage)
 
+        # url to return to
+        backUrl=path
+        if not backUrl.endswith('/inbox'):
+            backUrl+='/inbox'
+
+        print('************************  <form method="POST" action="'+backUrl+'/followconfirm">')
         profileStr= \
             ' <div class="hero-image">' \
             '  <div class="hero-text">' \
@@ -778,10 +784,13 @@ def htmlProfileAfterSearch(baseDir: str,path: str,httpPrefix: str, \
             '  </div>' \
             '</div>'+ \
             '<div class="container">\n' \
-            '  <center>' \
-            '    <a href="'+path+'"><button class="button"><span>Follow </span></button></a>' \
-            '    <a href="'+path+'"><button class="button"><span>Go Back </span></button></a>' \
-            '  </center>' \
+            '  <form method="POST" action="'+backUrl+'/followconfirm">' \
+            '    <center>' \
+            '      <input type="hidden" name="actor" value="'+personUrl+'">' \
+            '      <button type="submit" class="button" name="submitYes">Follow</button>' \
+            '      <a href="'+backUrl+'"><button class="button">Go Back</button></a>' \
+            '    </center>' \
+            '  </form>' \
             '</div>'
 
         result = []