Merge branch 'master' of ssh://git-rw.torproject.org/torouter

2 files changed, 19 insertions, 6 deletions

diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index bf48f54..690dc3f 100644
--- a/packages/torouter-web/src/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
@@ -2,7 +2,7 @@ import web
 from tui import config
 from tui import view
 from tui.view import render
-from tui.utils import session,configuration,parsing
+from tui.utils import session, configuration, parsing, fileio
 
 """
 This function is used to generate the network
@@ -75,6 +75,16 @@ Wireless network configuration page
 class wireless:
   # XXX do all the backend stuff
   def update_config(self, data):
+    itfc = parsing.interfaces(config.interfaces_file)
+    itfc.parse()
+    itfc.set_ssid(data.essid)
+    itfc.set_mac(data.mac)
+    itfc.wifi['netmask'] = data.netmask
+    itfc.wifi['address'] = data.address
+    filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi)
+    files = [('/etc/network/interfaces', filecontent)]
+    fileio.write(files)
+    #print itfc.output(itfc.wifi)
     return True
 
   def GET(self):
diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py
index bc66623..491c6b7 100644
--- a/packages/torouter-web/src/tui/controllers/tor.py
+++ b/packages/torouter-web/src/tui/controllers/tor.py
@@ -37,10 +37,13 @@ class torrc:
     return render.base(render.torconfig(output))
 
   def POST(self):
-    self.update_config(web.input())
-    trc = parsing.torrc(config.torrc_file)
-    trc.parse()
-    output = trc.html_output()
-    return render.base(render.torstatus(output,config.torrc_file))
+    if session.is_logged() > 0:
+      self.update_config(web.input())
+      trc = parsing.torrc(config.torrc_file)
+      trc.parse()
+      output = trc.html_output()
+      return render.base(render.torstatus(output,config.torrc_file))
+    else:
+      return render.base(render.login())