Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 07:19:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:micahflee/onionshare into develop

Browse Source
This commit is contained in:
Micah Lee 2020-12-13 11:43:46 -08:00
commit a5c7f091fc
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/onionshare_cli/resources/templates/denied.html
View File

@ -4,12 +4,11 @@
<head> <head>
<title>OnionShare</title> <title>OnionShare</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
</head> </head>
<body> <body>
<p>OnionShare download in progress</p> <p>OnionShare download in progress</p>
</body> </body>
</html> </html>

11
cli/onionshare_cli/web/share_mode.py
View File

@ -61,10 +61,7 @@ class ShareModeWeb(SendBaseModeWeb):
and self.download_in_progress and self.download_in_progress
) )
if deny_download: if deny_download:
r = make_response( r = make_response(render_template("denied.html"))
render_template("denied.html"),
static_url_path=self.web.static_url_path,
)
return self.web.add_security_headers(r) return self.web.add_security_headers(r)
# If download is allowed to continue, serve download page # If download is allowed to continue, serve download page
@ -87,11 +84,7 @@ class ShareModeWeb(SendBaseModeWeb):
and self.download_in_progress and self.download_in_progress
) )
if deny_download: if deny_download:
r = make_response( r = make_response(render_template("denied.html"))
render_template(
"denied.html", static_url_path=self.web.static_url_path
)
)
return self.web.add_security_headers(r) return self.web.add_security_headers(r)
# Prepare some variables to use inside generate() function below # Prepare some variables to use inside generate() function below