From 73d125b250b0e1741f8f7298226107566b33de61 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Tue, 25 Sep 2012 19:01:13 +0200
Subject: dhcp settings for lan and wifi

---
 torouterui/views.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'torouterui/views.py')

diff --git a/torouterui/views.py b/torouterui/views.py
index 12efb1d..d3daf77 100644
--- a/torouterui/views.py
+++ b/torouterui/views.py
@@ -108,19 +108,19 @@ def lanpage():
             formerr=None)
     # Got this far, need to validate form
     formerr = dict()
-    if request.form['ipv4method'] == 'disabled':
+    if request.form.get('ipv4enable') != 'true':
         pass    # no further validation
-    elif request.form['ipv4method'] == 'static':
+    else:
         if not netif.is_valid_ipv4(request.form['ipv4addr']):
             formerr['ipv4addr'] = "Not a valid IPv4 address"
         if not netif.is_valid_ipv4mask(request.form['ipv4netmask']):
             formerr['ipv4netmask'] = "Not a valid IPv4 netmask"
-        if not netif.is_valid_ipv4(request.form['ipv4gateway']):
-            formerr['ipv4gateway'] = "Not a valid IPv4 address"
-    else:
-        ke = KeyError("Invalid method: %s" % form['ipv4method'])
-        print ke
-        raise ke
+        if not netif.is_valid_ipv4(request.form['dhcpbase']):
+            formerr['dhcpbase'] = "Not a valid IPv4 address"
+        if not netif.is_valid_ipv4(request.form['dhcptop']):
+            formerr['dhcptop'] = "Not a valid IPv4 address"
+        if not netif.is_valid_ipv4mask(request.form['dhcpnetmask']):
+            formerr['dhcpnetmask'] = "Not a valid IPv4 netmask"
     if len(formerr.keys()) > 0:
         msg.append(("error",
             "Please correct the validation issues below"),)
@@ -134,6 +134,10 @@ def lanpage():
             msg.append(("error",
                 "Was unable to commit changes... permissions problem? \"%s\""
                     % ioerr))
+        except Exception, err:
+            msg.append(("error",
+                "Was unable to commit changes... \"%s\"" % err))
+            raise err
     return render_template('lan.html', form=request.form, status=status,
             formerr=formerr, messages=msg)
 
@@ -179,6 +183,9 @@ def wifipage():
             msg.append(("error",
                 "Was unable to commit changes... permissions problem? \"%s\""
                     % ioerr))
+        except Exception, e:
+            msg.append(("error",
+                "Was unable to commit changes... \"%s\"" % e))
     return render_template('wifi.html', form=request.form, status=status,
             formerr=formerr, messages=msg)
     return render_template('wifi.html', settings=None, status=None)
-- 
cgit v1.2.3