Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-29 01:06:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make receive_allow_receiver_shutdown setting work

Browse Source
This commit is contained in:
Micah Lee 2018-04-29 15:34:11 -07:00
parent 7e11687731
commit 996df24646
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
onionshare/web.py
View File

@ -266,7 +266,8 @@ class Web(object):
r = make_response(render_template( r = make_response(render_template(
'receive.html', 'receive.html',
slug=self.slug)) slug=self.slug,
receive_allow_receiver_shutdown=self.common.settings.get('receive_allow_receiver_shutdown')))
return self.add_security_headers(r) return self.add_security_headers(r)
@self.app.route("/<slug_candidate>/upload", methods=['POST']) @self.app.route("/<slug_candidate>/upload", methods=['POST'])
@ -326,9 +327,13 @@ class Web(object):
@self.app.route("/<slug_candidate>/close", methods=['POST']) @self.app.route("/<slug_candidate>/close", methods=['POST'])
def close(slug_candidate): def close(slug_candidate):
self.check_slug_candidate(slug_candidate) self.check_slug_candidate(slug_candidate)
self.force_shutdown()
r = make_response(render_template('closed.html')) if self.common.settings.get('receive_allow_receiver_shutdown'):
return self.add_security_headers(r) self.force_shutdown()
r = make_response(render_template('closed.html'))
return self.add_security_headers(r)
else:
return redirect('/{}'.format(slug_candidate))
def common_routes(self): def common_routes(self):
""" """

4
share/templates/receive.html
View File

@ -34,10 +34,10 @@
</form> </form>
</div> </div>
</div> </div>
{% if receive_allow_receiver_shutdown %}
<form method="post" action="/{{ slug }}/close"> <form method="post" action="/{{ slug }}/close">
<input type="submit" class="close-button" value="I'm Finished Uploading" /> <input type="submit" class="close-button" value="I'm Finished Uploading" />
</form> </form>
{% endif %}
</body> </body>
</html> </html>