projects / freetel-svn-tracking.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b0880b)
git-svn-id: https://svn.code.sf.net/p/freetel/code@718 01035d8c-6547-0410-b346-abe4f9...
authorhorse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Mon, 17 Sep 2012 23:24:46 +0000 (23:24 +0000)
committerhorse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Mon, 17 Sep 2012 23:24:46 +0000 (23:24 +0000)
mini-asterisk-gui2/cgi-bin/setservice.cgi [new file with mode: 0644] patch | blob
mini-asterisk-gui2/network.js patch | blob | history

diff --git a/mini-asterisk-gui2/cgi-bin/setservice.cgi b/mini-asterisk-gui2/cgi-bin/setservice.cgi
new file mode 100644 (file)
index 0000000..9c29357
--- /dev/null
+++ b/mini-asterisk-gui2/cgi-bin/setservice.cgi
@@ -0,0 +1,28 @@
+#!/bin/sh
+# setservice.cgi
+# Ian Roberts 18 Sept 2012
+#
+# CGI to return the output from an service command 
+#
+# valid actions are restartstatic, restartdhcp, restartbackup, enabledhcp, enablestatic
+#
+cat <<EOF
+Content-type: text/html
+
+<html>
+<head>
+<meta http-equiv="cache-control" content="no-cache">
+<meta http-equiv="pragma" content="no-cache">
+<meta http-equiv="expires" content="-1">
+</head>
+<body>
+EOF
+
+ARG=`echo "$QUERY_STRING" | sed -n "s/.*action=//p"`
+echo "$ARG"
+
+# /etc/init.d/network "$ARG"
+cat <<EOF
+</body>
+</html>
+EOF
diff --git a/mini-asterisk-gui2/network.js b/mini-asterisk-gui2/network.js
index af9d25c2307d89c679e7424b488cb2d85c3b91b9..650900a828e820bfb813a55881f258c2e22d21ca 100644 (file)
--- a/mini-asterisk-gui2/network.js
+++ b/mini-asterisk-gui2/network.js
@@ -165,66 +165,58 @@ function onClickApply() {
 
     if (document.network.dhcp.value == "yes") {
 
-       if (dhcp = "no") {
-           // disable network-static service and endable network service
-           downloadUrl("/cgi-bin/network-static.cgi?action=disable",GenericReturn);
-           downloadUrl("/cgi-bin/network-static.cgi?action=stop",GenericReturn);
-
-           downloadUrl("/cgi-bin/network.cgi?action=enable",GenericReturn);
-           downloadUrl("/cgi-bin/network.cgi?action=start",GenericReturn);
-       }
-       else {
-           // dhcp already running, restart service
-           downloadUrl("/cgi-bin/network.cgi?action=stop",GenericReturn);
-           downloadUrl("/cgi-bin/network.cgi?action=start",GenericReturn);
-       }
+               if (dhcp = "no") {
+                       // disable network-static service and endable network service
+                       downloadUrl("/cgi-bin/setservice.cgi?action=enabledhcp",GenericReturn);
+               }
+               else {
+                       // dhcp already running, restart service
+                       downloadUrl("/cgi-bin/setservice.cgi?action=restartdhcp",GenericReturn);
+               }
     }
     else {
 
-       if (dhcp = "yes") {
-           // disable network service and enable network-static service
-           downloadUrl("/cgi-bin/network.cgi?action=stop",GenericReturn);
-           downloadUrl("/cgi-bin/network.cgi?action=disable",GenericReturn);
-           downloadUrl("/cgi-bin/network-static.cgi?action=enable",GenericReturn);
-       }
-
-       // change network-static file variables
-
-       if (document.network.ipaddress.value != ipaddress) {
-           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,GenericReturn);
-       }
-
-       if (document.network.netmask.value != netmask) {
-           var new_netmask = document.network.netmask.value;
-           var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=NETMASK=&that="' + new_netmask + '"';
-           downloadUrl(url,GenericReturn);
-       }
-
-       if (document.network.gateway.value != gateway) {
-           var new_gateway = document.network.gateway.value;
-           var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=GATEWAY=&that="' + new_gateway + '"';
-           downloadUrl(url,GenericReturn);
-       }
-
-       if (document.network.dns.value != dns) {
-           var new_dns = document.network.dns.value;
-           var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=DNS=&that="' + new_dns + '"';
-           downloadUrl(url,GenericReturn);
-       }
-
-       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/network-backdoor.cgi?action=stop",GenericReturn);
-       downloadUrl("/cgi-bin/network-backdoor.cgi?action=start",GenericReturn);
-       }
-
-       // finally restart network-static service with new parameters
-
-    downloadUrl("/cgi-bin/network-static.cgi?action=stop",GenericReturn);
-    downloadUrl("/cgi-bin/network-static.cgi?action=start",GenericReturn);
-    }
+               if (dhcp = "yes") {
+                       // disable network service and enable network-static service
+                       downloadUrl("/cgi-bin/setservice.cgi?action=enablestatic",GenericReturn);
+               }
+
+               // change network-static file variables
+
+               if (document.network.ipaddress.value != ipaddress) {
+                       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,GenericReturn);
+               }
+
+               if (document.network.netmask.value != netmask) {
+                       var new_netmask = document.network.netmask.value;
+                       var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=NETMASK=&that="' + new_netmask + '"';
+                       downloadUrl(url,GenericReturn);
+               }
+
+               if (document.network.gateway.value != gateway) {
+                       var new_gateway = document.network.gateway.value;
+                       var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=GATEWAY=&that="' + new_gateway + '"';
+                       downloadUrl(url,GenericReturn);
+               }
+
+               if (document.network.dns.value != dns) {
+                       var new_dns = document.network.dns.value;
+                       var url = '/cgi-bin/setline.cgi?file=/etc/init.d/network-static&this=DNS=&that="' + new_dns + '"';
+                       downloadUrl(url,GenericReturn);
+               }
+
+               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);
+               }
+
+               // finally restart network-static service with new parameters
+
+               downloadUrl("/cgi-bin/setservice.cgi?action=restartstatic",GenericReturn);
+
+               }
 }
Mirror of the freetel SVN https://svn.code.sf.net/p/freetel/code/