From 208f929f1fe2566317310b50e33819c68ecd5e77 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 26 Aug 2019 17:07:04 +0100 Subject: [PATCH] Sequence --- daemon.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/daemon.py b/daemon.py index 5afc296c9..3e995e241 100644 --- a/daemon.py +++ b/daemon.py @@ -559,8 +559,26 @@ class PubServer(BaseHTTPRequestHandler): self.server.GETbusy=False return + if self.path.startswith('/terms'): + msg=htmlTermsOfService(self.server.baseDir, \ + self.server.httpPrefix, \ + self.server.domainFull).encode() + self._login_headers('text/html',len(msg)) + self.wfile.write(msg) + self.server.GETbusy=False + return + + if self.path.startswith('/about'): + msg=htmlAbout(self.server.baseDir, \ + self.server.httpPrefix, \ + self.server.domainFull).encode() + self._login_headers('text/html',len(msg)) + self.wfile.write(msg) + self.server.GETbusy=False + return + # if not authorized then show the login screen - if htmlGET and self.path!='/login' and self.path!='/' and self.path!='/terms': + if htmlGET and self.path!='/login' and self.path!='/': if '/media/' not in self.path and \ '/sharefiles/' not in self.path and \ '/statuses/' not in self.path and \ @@ -784,24 +802,6 @@ class PubServer(BaseHTTPRequestHandler): self.server.GETbusy=False return - if self.path.startswith('/terms'): - msg=htmlTermsOfService(self.server.baseDir, \ - self.server.httpPrefix, \ - self.server.domainFull).encode() - self._login_headers('text/html',len(msg)) - self.wfile.write(msg) - self.server.GETbusy=False - return - - if self.path.startswith('/about'): - msg=htmlAbout(self.server.baseDir, \ - self.server.httpPrefix, \ - self.server.domainFull).encode() - self._login_headers('text/html',len(msg)) - self.wfile.write(msg) - self.server.GETbusy=False - return - if self.path.startswith('/login') or self.path=='/': # request basic auth msg=htmlLogin(self.server.baseDir).encode('utf-8')