Changeset 714

Timestamp:

06/01/06 04:36:16 (7 years ago)

Author:

mglb1

Message:

• Minor bugfixes to the wizard to allow configuration with DSL modems

Location:

ccsd/private

Files:

• modules/ccs_monitor_rurallink.py (modified) (3 diffs)
• resources/rurallink.js (modified) (2 diffs)

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -2968 +2968 @@
         elif "isptype" in data.keys():
             try:
-                if "username" not in data.keys():
-                    raise ccs_rurallink_error("Missing post variables!")
+                changeISP(data["isptype"])
+            except:
+                log_error("Exception setting ISP type", sys.exc_info())
+                isperr = "Failed to set ISP type"
+                request.send_error(500, "Unable to setup ISP")
+                request.end_headers()
+                return
+            request.send_response(200, "ISP type set")
+            request.end_headers()
+            return
+        elif "username" in data.keys():
+            try:
                 if "pass" not in data.keys():
                     raise ccs_rurallink_error("Missing post variables!")
-                changeISP(data["isptype"])
                 username = urllib.unquote(data["username"]).strip()
                 password = urllib.unquote(data["pass"]).strip()
@@ -4155 +4164 @@
     network = parts[len(parts)-1]
     
-    if network != int_ifname and network != ap0_ifname:
+    if network not in ["internal", "ap0"]:
         # Unknown network
         request.send_error(404, "Cannot set policy for unknown network!")
@@ -4178 +4187 @@
     # Update the policy
     pref_set("traffic", "%s_policy" % network, policy, monitor_prefs)
-
+    
     # Now update the actual firewall
     request.send_response(200, "Policy updated")
     request.end_headers()
-    
+
+    doFirewall("start")
+
 @registerPage("/traffic/firewall", requireAuth=True, realm=CPE_ADMIN_REALM)
 def trafficfirewall(request, method):

ccsd/private/resources/rurallink.js

@@ -44 +44 @@
     },
     '#wizard_isptype': function(element){
-        element.onchange = wizardISPUpdated;
+        element.onchange = wizardISPTypeUpdated;
     },
     '#wizard_ispusername': function(element){
@@ -191 +191 @@
         onSuccess:wizardUpdateSuccess, onFailure:wizardUpdateFailure});
 }
+function wizardISPTypeUpdated(e) {
+    type = $F("wizard_isptype");
+    pars =  "isptype=" + type;
+    myAjax = new Ajax.Request("/", {method: 'post', postBody: pars});
+}
 function wizardISPUpdated(e) {
-    type = $F("wizard_isptype");
     username = $F("wizard_ispusername");
     password = $F("wizard_isppassword");
-    if (type=="" || username=="" || password=="") {
+    if (username=="" || password=="") {
         // Not all fields are complete
         return;
     }
     showUpdateWindow("Configuring ISP");
-    pars =  "isptype=" + type + "&username=" + username + "&pass=" + password;
+    pars =  "username=" + username + "&pass=" + password;
     myAjax = new Ajax.Request("/", {method: 'post', postBody: pars, 
         onSuccess:wizardUpdateSuccess, onFailure:wizardUpdateFailure});