aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-web/src/tui/controllers
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
commit57e54f969b840546925d16ceceb130a0f3927140 (patch)
treec2a498d35477d81161783e5eb8e7be726eebc0b0 /packages/torouter-web/src/tui/controllers
parent702600566d00c495c418631cd64ee99839fea5a0 (diff)
parent525766e515148f9da5e78d39d1905264a4d14bad (diff)
downloadtorouter-57e54f969b840546925d16ceceb130a0f3927140.tar.gz
torouter-57e54f969b840546925d16ceceb130a0f3927140.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-web/src/tui/controllers')
-rw-r--r--packages/torouter-web/src/tui/controllers/tor.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py
index d07cb71..af8678c 100644
--- a/packages/torouter-web/src/tui/controllers/tor.py
+++ b/packages/torouter-web/src/tui/controllers/tor.py
@@ -1,22 +1,28 @@
import web
import view, config
from view import render
-from tui.utils import session
+from tui.utils import session, parsing
"""
The main Tor status page
"""
class status:
def GET(self):
- return render.base(render.torstatus())
+ trc = parsing.torrc(config.torrc_file)
+ trc.parse()
+ output = trc.html_output()
+ return render.base(render.torstatus(output,config.torrc_file))
def POST(self):
- return render.base(render.torstatus())
+ trc = parsing.torrc(config.torrc_file)
+ trc.parse()
+ output = trc.html_output()
+ return render.base(render.torstatus(output,config.torrc_file))
"""
Tor configuration page
"""
-class config:
+class torrc:
def update_config(self, data):
return True