diff options
author | Micah Lee <micah@micahflee.com> | 2021-09-26 11:43:09 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2021-09-26 11:43:09 -0700 |
commit | d08d5f0f32f755f504494d80794886f346fbafdb (patch) | |
tree | 0e834bfe5946dd068d3c1803c7a22a991c377a33 /cli/onionshare_cli/web/receive_mode.py | |
parent | b66e742bc20ae977232fc53f22d485c10173ac2f (diff) | |
parent | 5de48bba6e3c17b0b45516fe536a3c500fab4fc4 (diff) | |
download | onionshare-d08d5f0f32f755f504494d80794886f346fbafdb.tar.gz onionshare-d08d5f0f32f755f504494d80794886f346fbafdb.zip |
Merge branch 'develop' into stablev2.4
Diffstat (limited to 'cli/onionshare_cli/web/receive_mode.py')
-rw-r--r-- | cli/onionshare_cli/web/receive_mode.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/cli/onionshare_cli/web/receive_mode.py b/cli/onionshare_cli/web/receive_mode.py index 76abb0a8..6b106d37 100644 --- a/cli/onionshare_cli/web/receive_mode.py +++ b/cli/onionshare_cli/web/receive_mode.py @@ -86,16 +86,13 @@ class ReceiveModeWeb: ) self.web.add_request(self.web.REQUEST_LOAD, request.path) - r = make_response( - render_template( - "receive.html", - static_url_path=self.web.static_url_path, - disable_text=self.web.settings.get("receive", "disable_text"), - disable_files=self.web.settings.get("receive", "disable_files"), - title=self.web.settings.get("general", "title"), - ) + return render_template( + "receive.html", + static_url_path=self.web.static_url_path, + disable_text=self.web.settings.get("receive", "disable_text"), + disable_files=self.web.settings.get("receive", "disable_files"), + title=self.web.settings.get("general", "title") ) - return self.web.add_security_headers(r) @self.web.app.route("/upload", methods=["POST"], provide_automatic_options=False) def upload(ajax=False): @@ -222,12 +219,11 @@ class ReceiveModeWeb: ) else: # It was the last upload and the timer ran out - r = make_response( + return make_response( render_template("thankyou.html"), static_url_path=self.web.static_url_path, title=self.web.settings.get("general", "title"), ) - return self.web.add_security_headers(r) @self.web.app.route("/upload-ajax", methods=["POST"], provide_automatic_options=False) def upload_ajax_public(): |