From b53b6723cc88dff56c048bbda99c7b2d0a261a96 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 28 Apr 2018 22:01:48 +0200 Subject: [PATCH] Allow tor_use_bridges and trackers_proxy to be set with configSet --- src/Ui/UiWebsocket.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 4f65ab5e..b46bf08f 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -972,12 +972,18 @@ class UiWebsocket(object): return self.response(to, {"error": "Not a directory"}) def actionConfigSet(self, to, key, value): - if key not in ["tor", "language"]: + allowed_keys = ["tor", "language", "tor_use_bridges", "trackers_proxy"] + + if key not in allowed_keys: self.response(to, {"error": "Forbidden"}) return config.saveValue(key, value) + instant_change_keys = ["language", "tor_use_bridges", "trackers_proxy"] + if key in instant_change_keys: + setattr(config, key, value) + if key == "language": import Translate for translate in Translate.translates: @@ -985,6 +991,13 @@ class UiWebsocket(object): message = _["You have successfully changed the web interface's language!"] + "
" message += _["Due to the browser's caching, the full transformation could take some minute."] self.cmd("notification", ["done", message, 10000]) - config.language = value + + if key == "tor_use_bridges": + if value == None: + value = False + else: + value = True + tor_manager = sys.modules["main"].file_server.tor_manager + tor_manager.request("SETCONF UseBridges=%i" % value) self.response(to, "ok")