projects / freetel-svn-tracking.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4245b8)
added some cross-platform support
authordrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 7 Jan 2010 00:17:05 +0000 (00:17 +0000)
committerdrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 7 Jan 2010 00:17:05 +0000 (00:17 +0000)
git-svn-id: https://svn.code.sf.net/p/freetel/code@103 01035d8c-6547-0410-b346-abe4f91aad63

easy-asterisk-gui/Makefile patch | blob | history
easy-asterisk-gui/about.sh patch | blob | history
easy-asterisk-gui/index.html [new file with mode: 0644] patch | blob
easy-asterisk-gui/network.sh patch | blob | history
easy-asterisk-gui/set_network.sh patch | blob | history

diff --git a/easy-asterisk-gui/Makefile b/easy-asterisk-gui/Makefile
index b0ab04b3d590b42526a5ee44417fe2a0204b5467..729c8240f3eb21d2aeff12c5a2f74a162bdc8cdb 100644 (file)
--- a/easy-asterisk-gui/Makefile
+++ b/easy-asterisk-gui/Makefile
@@ -8,5 +8,5 @@
 #        make TESTIP=boris test
 
 test:
-       rcp faq.sh faq.html about.sh at-530.html ipphones.pl ipphones.sh ipphones.js voipline.jpg anphone.png phoneline.jpg ipphone.png phones.pl tooltips.html phones.sh phones.js tick.png cross.png banner.html menu.html check_loggedin.sh logout.sh login.sh network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin
+       rcp index.html faq.sh faq.html about.sh at-530.html ipphones.pl ipphones.sh ipphones.js voipline.jpg anphone.png phoneline.jpg ipphone.png phones.pl tooltips.html phones.sh phones.js tick.png cross.png banner.html menu.html check_loggedin.sh logout.sh login.sh network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin
        rcp sip.conf extensions.conf root@$(TESTIP):/etc/asterisk
diff --git a/easy-asterisk-gui/about.sh b/easy-asterisk-gui/about.sh
index 63b99f0e42082e5dc4836889d0b68297864052be..a6fd49cae10bab4c7b5d41cf32faf2e6d69d0051 100644 (file)
--- a/easy-asterisk-gui/about.sh
+++ b/easy-asterisk-gui/about.sh
@@ -42,6 +42,9 @@ cat <<EOF
       <tr><td align="left" valign="top"><h2>About</h2></td></tr>
 EOF
 echo '      <tr><td>Easy Asterisk $Revision$</td></tr> ' | sed -n 's/\$//pg'
+echo '      <tr><td>&nbsp;</td></tr>'
+echo '      <tr><td>Brought to you by the <a href="http://rowetel.com/ucasterisk/index.html">Free Telephony Project</a></td></tr>'
+echo '      <tr><td><img src="http://rowetel.com/images/ip04/ip04_case.jpg" /></td></tr>'
 
 more=`echo "$QUERY_STRING" | grep -oe "more=[^&?]*" | sed -n "s/more=//p"`
 if  [ $more -eq 1 ]; then
@@ -66,11 +69,14 @@ echo "      <tr><td>"
 cat /proc/version
 echo "      </td></tr>"
 
-echo "      <tr><td>&nbsp;</td></tr>"
-echo "      <tr><td><h3>ipkg list_installed</h3></td></tr>"
-echo "      <tr><td>"
-ipkg list_installed | tr '\n' '#' | sed -n 's/\#/<br>/pg'
-echo "      </td></tr>"
+which ipkg >> /dev/null
+if [ $? -eq 0 ]; then
+    echo "      <tr><td>&nbsp;</td></tr>"
+    echo "      <tr><td><h3>ipkg list_installed</h3></td></tr>"
+    echo "      <tr><td>"
+    ipkg list_installed | tr '\n' '#' | sed -n 's/\#/<br>/pg'
+    echo "      </td></tr>"
+fi
 
 echo "      <tr><td>&nbsp;</td></tr>"
 echo "      <tr><td><h3>cat /proc/loadavg</h3></td></tr>"
@@ -102,17 +108,21 @@ echo "      <tr><td>"
 cat /proc/cpuinfo
 echo "      </td></tr>"
 
-echo "      <tr><td>&nbsp;</td></tr>"
-echo "      <tr><td><h3>cat /proc/mtd</h3></td></tr>"
-echo "      <tr><td>"
-cat /proc/mtd | tr '\n' '#' | sed -n 's/\#/<br>/pg'
-echo "      </td></tr>"
+if [ -f /proc/mtd ]; then
+    echo "      <tr><td>&nbsp;</td></tr>"
+    echo "      <tr><td><h3>cat /proc/mtd</h3></td></tr>"
+    echo "      <tr><td>"
+    cat /proc/mtd | tr '\n' '#' | sed -n 's/\#/<br>/pg'
+    echo "      </td></tr>"
+fi
 
-echo "      <tr><td>&nbsp;</td></tr>"
-echo "      <tr><td><h3>cat /proc/yaffs</h3></td></tr>"
-echo "      <tr><td>"
-cat /proc/yaffs | tr '\n' '#' | sed -n 's/\#/<br>/pg'
-echo "      </td></tr>"
+if [ -f /proc/yaffs ]; then
+    echo "      <tr><td>&nbsp;</td></tr>"
+    echo "      <tr><td><h3>cat /proc/yaffs</h3></td></tr>"
+    echo "      <tr><td>"
+    cat /proc/yaffs | tr '\n' '#' | sed -n 's/\#/<br>/pg'
+    echo "      </td></tr>"
+fi
 
 echo "      <tr><td>&nbsp;</td></tr>"
 echo '      <tr><td><a href="about.sh">Less</a></td></tr>';
diff --git a/easy-asterisk-gui/index.html b/easy-asterisk-gui/index.html
new file mode 100644 (file)
index 0000000..8514560
--- /dev/null
+++ b/easy-asterisk-gui/index.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+<meta http-equiv="REFRESH" content="0;url=http:login.sh">
+</head>
+</html>
\ No newline at end of file
diff --git a/easy-asterisk-gui/network.sh b/easy-asterisk-gui/network.sh
index 1a683bcec1b5c56b9e745cda4d7e1def812c6c45..982a63bc03784ce75d224a77dd44923905cdd4f7 100644 (file)
--- a/easy-asterisk-gui/network.sh
+++ b/easy-asterisk-gui/network.sh
@@ -15,9 +15,10 @@ if [ $? -eq 1 ]; then
     exit
 fi
 
-echo `date` " get_network.sh" >> /tmp/easy_gui.log
+grok_network=0
 
 if [ -f /etc/rc.d/S10network ]; then
+  grok_network=1
   dhcp=yes
   ipaddress=`ifconfig eth0 | sed -n 's/.*inet addr:\(.*\)  Bcast.*/\1/p'`
   netmask=`ifconfig eth0 | sed -n 's/.*Mask:\(.*\)\s*/\1/p'`
@@ -27,6 +28,7 @@ fi
 
 if [ -f /etc/rc.d/S10network-static ]
 then
+  grok_network=1
   dhcp=no  
   ipaddress=`sed -n 's/IPADDRESS="\(.*\)"/\1/p' /etc/init.d/network-static`
   netmask=`sed -n 's/NETMASK="\(.*\)"/\1/p' /etc/init.d/network-static`
@@ -34,6 +36,36 @@ then
   dns=`sed -n 's/DNS="\(.*\)"/\1/p' /etc/init.d/network-static`
 fi
 
+# if we don't understand this machines network config then bail
+
+if [ $groknetwork -eq 0 ]; then
+cat << EOF
+<html>
+<title>Easy Asterisk - Network</title>
+EOF
+
+cat tooltips.html
+echo '<table align="center" width=800 border=0>'
+cat banner.html
+echo "    <tr>"
+cat menu.html    
+cat <<EOF
+
+    <td valign="top">
+    <table align="center" width=600 border=0>
+      <tr><td colspan="2" align="left" valign="top"><h2>Network</h2></td></tr>
+      <tr><td>Sorry - I can't edit the Network configuration on this machine</td></tr>
+    </td>
+    </table>
+    </td>
+    </tr>
+
+</table>
+
+</html>
+EOF
+fi
+ 
 if [ -f /etc/rc.d/S05network-backdoor ]; then
   backdoor=`sed -n 's/IPADDRESS="\(.*\)"/\1/p' /etc/init.d/network-backdoor`
 fi
diff --git a/easy-asterisk-gui/set_network.sh b/easy-asterisk-gui/set_network.sh
index dddb65af41424be200e30e5bf7455f1b4df6ffc9..23c69e785f0296f2a6e824b003f5f15da2ca0652 100755 (executable)
--- a/easy-asterisk-gui/set_network.sh
+++ b/easy-asterisk-gui/set_network.sh
@@ -22,8 +22,6 @@ gateway=`echo "$QUERY_STRING" | grep -oe "gateway=[^&?]*" | sed -n "s/gateway=//
 dns=`echo "$QUERY_STRING" | grep -oe "dns=[^&?]*" | sed -n "s/dns=//p"`
 backdoor=`echo "$QUERY_STRING" | grep -oe "backdoor=[^&?]*" | sed -n "s/backdoor=//p"`
 
-echo `date` " set_network.sh $dhcp $ipaddress $netmask $gateway $dns $backdoor" >> /tmp/easy_gui.log
-
 if [ $dhcp == "yes" ]; then
 
   # DHCP
Mirror of the freetel SVN https://svn.code.sf.net/p/freetel/code/