From d7a256f5571831b064d915a2be1657066e54cc85 Mon Sep 17 00:00:00 2001
From: horse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 18 Sep 2012 06:41:07 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@725
 01035d8c-6547-0410-b346-abe4f91aad63

---
 mini-asterisk-gui2/network.js | 42 +++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/mini-asterisk-gui2/network.js b/mini-asterisk-gui2/network.js
index 5b49cc79..71c206e5 100644
--- a/mini-asterisk-gui2/network.js
+++ b/mini-asterisk-gui2/network.js
@@ -176,29 +176,26 @@ function onClickApply() {
     }
     else {
 
-		if (dhcp = "yes") {
-			// disable network service and enable network-static service
-			downloadUrl("/cgi-bin/setservice.cgi?action=enablestatic",GenericReturn);
-		}
-
-		// change network-static file variables
+		// start cgi cascade
+		// disable network service and enable network-static service
+		downloadUrl("/cgi-bin/setservice.cgi?action=enablestatic",dhcpReturn);
 
-		var new_ipaddress = document.network.ipaddress.value;
-		var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=IPADDRESS=&that="' + new_ipaddress + '"';
-		
-		# kick off cascading cgi
-		downloadUrl(url,ipaddressReturn);
 
 
-//		if (document.network.backdoor.value != backdoor) {
-//			var new_backdoor = document.network.backdoor.value;
-//			var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-backup&this=BACKDOOR=&that="' + new_backdoor + '"';
-//			downloadUrl(url,GenericReturn);
-//			downloadUrl("/cgi-bin/setservice.cgi?action=restartbackup",GenericReturn);
-//		}
 
+	}
+}
 
+function dhcpReturn(doc,status) {
+    loadHtmlTextFile(doc, function(line) {
+	    //parseSipShowPeers(line);
 	}
+	);
+
+	var new_ipaddress = document.network.ipaddress.value;
+	var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=IPADDRESS=&that="' + new_ipaddress + '"';
+		
+	downloadUrl(url,ipaddressReturn);
 }
 
 function ipaddressReturn(doc,status) {
@@ -234,6 +231,17 @@ function gatewayReturn(doc,status) {
 	downloadUrl(url,dnsReturn);
 }
 
+
+//	var new_backdoor = document.network.backdoor.value;
+//	var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-backup&this=BACKDOOR=&that="' + new_backdoor + '"';
+//	downloadUrl(url,GenericReturn);
+
+
+
+//	downloadUrl("/cgi-bin/setservice.cgi?action=restartbackup",GenericReturn);
+//	
+
+
 function dnsReturn(doc,status) {
     loadHtmlTextFile(doc, function(line) {
 	    //parseSipShowPeers(line);
-- 
2.25.1