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

Consistent shared inbox path

master
Bob Mottram 2019-08-05 12:08:52 +01:00
parent f49a85e4fb
commit 646c3ecc1e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon.py
View File

@ -429,12 +429,17 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('GET Not authorized') print('GET Not authorized')
# treat shared inbox paths consistently
if self.path=='/sharedInbox' or self.path=='/users/inbox':
self.path='/inbox'
# if not authorized then show the login screen # if not authorized then show the login screen
if self.headers.get('Accept'): if self.headers.get('Accept'):
if 'text/html' in self.headers['Accept'] and self.path!='/login': if 'text/html' in self.headers['Accept'] and self.path!='/login':
if '/media/' not in self.path and \ if '/media/' not in self.path and \
'/sharefiles/' not in self.path and \ '/sharefiles/' not in self.path and \
'/icons/' not in self.path: '/icons/' not in self.path and \
self.path != '/inbox':
divertToLoginScreen=True divertToLoginScreen=True
if self.path.startswith('/users/'): if self.path.startswith('/users/'):
nickStr=self.path.split('/users/')[1] nickStr=self.path.split('/users/')[1]