mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

options processed earlier

master
Bob Mottram 2019-08-24 22:14:33 +01:00
parent a665eb66eb
commit 99929a9a28
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
daemon.py
View File

@ -531,6 +531,23 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy=False self.server.GETbusy=False
return return
# show the person options screen with view/follow/block/report
if htmlGET and '/users/' in self.path:
if '?options=' in self.path:
optionsStr=self.path.split('?options=')[1]
originPathStr=self.path.split('?options=')[0]
if ';' in optionsStr:
optionsActor=optionsStr.split(';')[0]
optionsProfileUrl=optionsStr.split(';')[1]
msg=htmlPersonOptions(self.server.baseDir,originPathStr,optionsActor,optionsProfileUrl).encode()
self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg)
self.server.GETbusy=False
return
self._redirect_headers(originPathStr,cookie)
self.server.GETbusy=False
return
# if not authorized then show the login screen # 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!='/' and self.path!='/terms':
if '/media/' not in self.path and \ if '/media/' not in self.path and \
@ -809,23 +826,6 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy=False self.server.GETbusy=False
return return
# show the person options screen with view/follow/block/report
if '/users/' in self.path:
if '?options=' in self.path:
optionsStr=self.path.split('?options=')[1]
originPathStr=self.path.split('?options=')[0]
if ';' in optionsStr:
optionsActor=optionsStr.split(';')[0]
optionsProfileUrl=optionsStr.split(';')[1]
msg=htmlPersonOptions(self.server.baseDir,originPathStr,optionsActor,optionsProfileUrl).encode()
self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg)
self.server.GETbusy=False
return
self._redirect_headers(originPathStr,cookie)
self.server.GETbusy=False
return
# hashtag search # hashtag search
if self.path.startswith('/tags/'): if self.path.startswith('/tags/'):
pageNumber=1 pageNumber=1