Checking for images

main
Bob Mottram 2021-07-09 21:12:46 +01:00
parent c8b39b0449
commit dddf2bb57f
1 changed files with 4 additions and 13 deletions

View File

@ -6082,11 +6082,7 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings: {}) -> None: GETstartTime, GETtimings: {}) -> None:
"""Shows a help screen image """Shows a help screen image
""" """
if not path.endswith('.jpg') and \ if not isImageFile(path):
not path.endswith('.png') and \
not path.endswith('.webp') and \
not path.endswith('.avif') and \
not path.endswith('.gif'):
return return
mediaStr = path.split('/helpimages/')[1] mediaStr = path.split('/helpimages/')[1]
if '/' not in mediaStr: if '/' not in mediaStr:
@ -11389,14 +11385,9 @@ class PubServer(BaseHTTPRequestHandler):
'show screenshot done') 'show screenshot done')
# image on login screen or qrcode # image on login screen or qrcode
if self.path == '/login.png' or \ if (isImageFile(self.path) and
self.path == '/login.gif' or \ (self.path.startswith('/login.') or
self.path == '/login.svg' or \ self.path.startswith('/qrcode.png'))):
self.path == '/login.webp' or \
self.path == '/login.avif' or \
self.path == '/login.jpeg' or \
self.path == '/login.jpg' or \
self.path == '/qrcode.png':
iconFilename = \ iconFilename = \
self.server.baseDir + '/accounts' + self.path self.server.baseDir + '/accounts' + self.path
if os.path.isfile(iconFilename): if os.path.isfile(iconFilename):