From 2a2279b05c5cf49181c72727d12c8b3b83609d2b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 2 Sep 2020 18:23:36 +0100
Subject: [PATCH] Move edit profile screen to its own method

---
 daemon.py | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/daemon.py b/daemon.py
index bdacb70f5..0cd4e3afc 100644
--- a/daemon.py
+++ b/daemon.py
@@ -7180,6 +7180,28 @@ class PubServer(BaseHTTPRequestHandler):
             return True
         return False
 
+    def _editProfile(self, callingDomain: str, path: str,
+                     translate: {}, baseDir: str,
+                     httpPrefix: str, domain: str, port: int,
+                     cookie: str) -> bool:
+        """Show the edit profile screen
+        """
+        if '/users/' in path and path.endswith('/editprofile'):
+            msg = htmlEditProfile(translate,
+                                  baseDir,
+                                  path, domain,
+                                  port,
+                                  httpPrefix).encode('utf-8')
+            if msg:
+                self._set_headers('text/html', len(msg),
+                                  cookie, callingDomain)
+                self._write(msg)
+            else:
+                self._404()
+            self.server.GETbusy = False
+            return True
+        return False
+
     def do_GET(self):
         callingDomain = self.server.domainFull
         if self.headers.get('Host'):
@@ -8434,19 +8456,13 @@ class PubServer(BaseHTTPRequestHandler):
                         return
 
             # edit profile in web interface
-            if '/users/' in self.path and self.path.endswith('/editprofile'):
-                msg = htmlEditProfile(self.server.translate,
-                                      self.server.baseDir,
-                                      self.path, self.server.domain,
-                                      self.server.port,
-                                      self.server.httpPrefix).encode('utf-8')
-                if msg:
-                    self._set_headers('text/html', len(msg),
-                                      cookie, callingDomain)
-                    self._write(msg)
-                else:
-                    self._404()
-                self.server.GETbusy = False
+            if self._editProfile(callingDomain, self.path,
+                                 self.server.translate,
+                                 self.server.baseDir,
+                                 self.server.httpPrefix,
+                                 self.server.domain,
+                                 self.server.port,
+                                 cookie):
                 return
 
             if self._showNewPost(callingDomain, self.path,