mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-15 07:37:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/helper.py
This commit is contained in:
Ozzieisaacs
2020-05-10 19:04:29 +02:00
parent 308fd55483 92db00692a
commit 16a3deec2c
12 changed files with 412 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cps/helper.py
View File

@@ -467,7 +467,7 @@ def reset_password(user_id):
def generate_random_password():
s = "abcdefghijklmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%&*()?"
passlen = 8
return "".join(random.sample(s, passlen))
return "".join(s[c % len(s)] for c in os.urandom(passlen))
################################## External interface
@@ -615,8 +615,9 @@ def do_download_file(book, book_format, client, data, headers):
headers["Content-Disposition"] = headers["Content-Disposition"].replace(".kepub", ".kepub.epub")
response = make_response(send_from_directory(filename, data.name + "." + book_format))
response.headers = headers
# ToDo Check headers parameter
for element in headers:
response.headers[element[0]] = element[1]
return response
##################################