From 433599e87af766709a592f5b2d0cbb43b25e3587 Mon Sep 17 00:00:00 2001 From: horse69 Date: Mon, 17 Sep 2012 23:24:46 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@718 01035d8c-6547-0410-b346-abe4f91aad63 --- mini-asterisk-gui2/cgi-bin/setservice.cgi | 28 ++++++ mini-asterisk-gui2/network.js | 110 ++++++++++------------ 2 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 mini-asterisk-gui2/cgi-bin/setservice.cgi diff --git a/mini-asterisk-gui2/cgi-bin/setservice.cgi b/mini-asterisk-gui2/cgi-bin/setservice.cgi new file mode 100644 index 00000000..9c29357c --- /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 + +ARG=`echo "$QUERY_STRING" | sed -n "s/.*action=//p"` +echo "$ARG" + +# /etc/init.d/network "$ARG" +cat < + +EOF diff --git a/mini-asterisk-gui2/network.js b/mini-asterisk-gui2/network.js index af9d25c2..650900a8 100644 --- 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); + + } } -- 2.25.1