indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Less indentation

merge-requests/30/head
Bob Mottram 2021-02-26 16:02:31 +00:00
parent 7dbaaa267a
commit e751eecf1e
1 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -9776,10 +9776,13 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings: {}) -> bool: GETstartTime, GETtimings: {}) -> bool:
"""Shows an avatar or banner or profile background image """Shows an avatar or banner or profile background image
""" """
if '/users/' in path: if '/users/' not in path:
if self._pathIsImage(path): return False
if not self._pathIsImage(path):
return False
avatarStr = path.split('/users/')[1] avatarStr = path.split('/users/')[1]
if '/' in avatarStr and '.temp.' not in path: if not ('/' in avatarStr and '.temp.' not in path):
return False
avatarNickname = avatarStr.split('/')[0] avatarNickname = avatarStr.split('/')[0]
avatarFile = avatarStr.split('/')[1] avatarFile = avatarStr.split('/')[1]
avatarFileExt = avatarFile.split('.')[-1] avatarFileExt = avatarFile.split('.')[-1]
@ -9799,7 +9802,8 @@ class PubServer(BaseHTTPRequestHandler):
avatarFilename = \ avatarFilename = \
baseDir + '/accounts/' + \ baseDir + '/accounts/' + \
avatarNickname + '@' + domain + '/' + avatarFile avatarNickname + '@' + domain + '/' + avatarFile
if os.path.isfile(avatarFilename): if not os.path.isfile(avatarFilename):
return False
if self._etag_exists(avatarFilename): if self._etag_exists(avatarFilename):
# The file has not changed # The file has not changed
self._304() self._304()
@ -9828,7 +9832,6 @@ class PubServer(BaseHTTPRequestHandler):
'icon shown done', 'icon shown done',
'avatar background shown') 'avatar background shown')
return True return True
return False
def _confirmDeleteEvent(self, callingDomain: str, path: str, def _confirmDeleteEvent(self, callingDomain: str, path: str,
baseDir: str, httpPrefix: str, cookie: str, baseDir: str, httpPrefix: str, cookie: str,