From f1d31e5aeb0489ddf08d52171475d3ad05bace9d Mon Sep 17 00:00:00 2001 From: drowe67 Date: Sun, 3 Jan 2010 23:47:03 +0000 Subject: [PATCH] added check for Internet connection, working on form validation git-svn-id: https://svn.code.sf.net/p/freetel/code@86 01035d8c-6547-0410-b346-abe4f91aad63 --- easy-asterisk-gui/Makefile | 2 +- easy-asterisk-gui/{easy.js => network.js} | 7 ++++++- easy-asterisk-gui/{test.sh => network.sh} | 20 +++++++++++++++++--- easy-asterisk-gui/set_network.sh | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) rename easy-asterisk-gui/{easy.js => network.js} (93%) rename easy-asterisk-gui/{test.sh => network.sh} (77%) diff --git a/easy-asterisk-gui/Makefile b/easy-asterisk-gui/Makefile index 42de4ab8..e06b264e 100644 --- a/easy-asterisk-gui/Makefile +++ b/easy-asterisk-gui/Makefile @@ -9,4 +9,4 @@ TESTIP=192.168.1.150 # rcp index.html root@$(TESTIP):/var/lib/asterisk/static-http/ test: - rcp test.sh test1.sh easy.js easy1.js set_network.sh root@$(TESTIP):/www/cgi-bin + rcp network.sh network.js set_network.sh root@$(TESTIP):/www/cgi-bin diff --git a/easy-asterisk-gui/easy.js b/easy-asterisk-gui/network.js similarity index 93% rename from easy-asterisk-gui/easy.js rename to easy-asterisk-gui/network.js index 26200581..6a6663c1 100644 --- a/easy-asterisk-gui/easy.js +++ b/easy-asterisk-gui/network.js @@ -57,5 +57,10 @@ function localInit() { $('netmask').value = init_netmask; $('gateway').value = init_gateway; $('dns').value = init_dns; - $('networkapply').disabled = 0; + $('internet').value = init_internet; +} + +function validate_form(form) +{ + return true; } diff --git a/easy-asterisk-gui/test.sh b/easy-asterisk-gui/network.sh similarity index 77% rename from easy-asterisk-gui/test.sh rename to easy-asterisk-gui/network.sh index bed3e7ae..33869237 100644 --- a/easy-asterisk-gui/test.sh +++ b/easy-asterisk-gui/network.sh @@ -1,4 +1,7 @@ #!/bin/sh +# network.sh +# David Rowe 4 Jan 2010 +# CGI for network GUI echo `date` " get_network.sh" >> /tmp/easy_gui.log @@ -19,6 +22,15 @@ then dns=`sed -n 's/DNS="\(.*\)"/\1/p' /etc/init.d/network-static` fi +# See if we have Internet connectivity + +packet_loss=`ping google.com -c 1 -q | sed -n 's/.*received, \(.*\)% packet loss/\1/p'` +if [ $packet_loss == "0" ]; then + internet="Good"; +else + internet="Not Available"; +fi + # Construct the web page ------------------------------- echo "" @@ -29,14 +41,15 @@ echo 'var init_ipaddress="'$ipaddress'";' echo 'var init_netmask="'$netmask'";' echo 'var init_gateway="'$gateway'";' echo 'var init_dns="'$dns'";' -cat easy.js +echo 'var init_internet="'$internet'";' +cat network.js echo "" cat << EOF -Easy Asterisk GUI +Easy Asterisk - Network -
+ @@ -47,6 +60,7 @@ cat << EOF +
Netmask:
Gateway:
DNS:
Internet Connection:
diff --git a/easy-asterisk-gui/set_network.sh b/easy-asterisk-gui/set_network.sh index 01163034..d79fe634 100755 --- a/easy-asterisk-gui/set_network.sh +++ b/easy-asterisk-gui/set_network.sh @@ -50,7 +50,7 @@ cat < set_network.sh - + -- 2.25.1