qwell: branch aadk r869 - in /branches/aadk: config/ scripts/

[asterisk-gui-commits at lists.digium.com]

Author: qwell
Date: Fri May  4 14:42:40 2007
New Revision: 869

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=869
Log:
Modify network scripts/html to remove variables we don't use/need.

Modified:
    branches/aadk/config/networking.html
    branches/aadk/scripts/networking.sh

Modified: branches/aadk/config/networking.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/networking.html?view=diff&rev=869&r1=868&r2=869
==============================================================================
--- branches/aadk/config/networking.html (original)
+++ branches/aadk/config/networking.html Fri May  4 14:42:40 2007
@@ -26,7 +26,7 @@
 <link href="stylesheets/rico.css" media="all" rel="Stylesheet" type="text/css" />
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
 <script>
-	var nwfields = ["HOSTNAME","DHCP_WAN","IP_WAN","SUBNET_WAN","GATEWAY_WAN","DNS_WAN","DHCP_LAN","IP_LAN","SUBNET_LAN","GATEWAY_LAN","DNS_LAN","SSHACCESS","TFTP_LAN","ROUTER_LAN","LEASE_LAN","NTP_LAN","MAX_LEASE","START_RANGE_LAN","END_RANGE_LAN","DOMAIN_LAN","status","save","cancel"];
+	var nwfields = ["HOSTNAME","DHCP_WAN","IP_WAN","SUBNET_WAN","GATEWAY_WAN","DNS_WAN","DHCP_LAN","IP_LAN","SUBNET_LAN","DNS_LAN","SSHACCESS","TFTP_LAN","LEASE_LAN","NTP_LAN","MAX_LEASE","START_RANGE_LAN","END_RANGE_LAN","DOMAIN_LAN","status","save","cancel"];
 	var widgets = {};
 	var networkingcallbacks = {};
 
@@ -67,14 +67,12 @@
 			_$('END_RANGE_LAN').disabled = false;
 			_$('LEASE_LAN').disabled = false;
 			_$('MAX_LEASE').disabled = false;
-			_$('ROUTER_LAN').disabled = false;
 
 		}else{
 			_$('START_RANGE_LAN').disabled = true;
 			_$('END_RANGE_LAN').disabled = true;
 			_$('LEASE_LAN').disabled = true;
 			_$('MAX_LEASE').disabled = true;
-			_$('ROUTER_LAN').disabled = true;
 		}
 	}
 
@@ -89,9 +87,9 @@
 
 		var cmd1 = "echo \"DHCP_WAN=" + dwv + " IP_WAN=" + _$('IP_WAN').value + " SUBNET_WAN=" + _$('SUBNET_WAN').value + " GATEWAY_WAN=" + _$('GATEWAY_WAN').value + " DNS_WAN=" + _$('DNS_WAN').value + "\" > " + network_params;
 
-		var cmd2 = "echo \" DHCP_LAN=" + dlv + " IP_LAN=" + _$('IP_LAN').value + " SUBNET_LAN=" + _$('SUBNET_LAN').value + " GATEWAY_LAN=" + _$('GATEWAY_LAN').value + " DNS_LAN=" + _$('DNS_LAN').value + "\" >> " + network_params;
-
-		var cmd3 = "echo \" DNS_LAN=" + _$('DNS_LAN').value + " START_RANGE_LAN=" + _$('START_RANGE_LAN').value + " END_RANGE_LAN=" + _$('END_RANGE_LAN').value + " ROUTER_LAN=" + _$('ROUTER_LAN').value + " SSHACCESS=" + ssv + "\" >> " + network_params;
+		var cmd2 = "echo \" DHCP_LAN=" + dlv + " IP_LAN=" + _$('IP_LAN').value + " SUBNET_LAN=" + _$('SUBNET_LAN').value + " DNS_LAN=" + _$('DNS_LAN').value + "\" >> " + network_params;
+
+		var cmd3 = "echo \" DNS_LAN=" + _$('DNS_LAN').value + " START_RANGE_LAN=" + _$('START_RANGE_LAN').value + " END_RANGE_LAN=" + _$('END_RANGE_LAN').value + " SSHACCESS=" + ssv + "\" >> " + network_params;
 
 		var cmd4 = "echo \" HOSTNAME=" + _$('HOSTNAME').value + " LEASE_LAN=" + _$('LEASE_LAN').value + " NTP_LAN=" + _$('NTP_LAN').value + " TFTP_LAN=" + _$('TFTP_LAN').value + " DOMAIN_LAN=" + _$('DOMAIN_LAN').value + " MAX_LEASE=" + _$('MAX_LEASE').value + "\" >> " + network_params;
 
@@ -243,9 +241,6 @@
 			<TR>	<TD>SUBNET</TD>
 				<TD><input type="text" id='SUBNET_LAN' size=14></TD>
 			</TR>
-			<TR>	<TD>GATEWAY</TD>
-				<TD><input type="text" id='GATEWAY_LAN' size=14></TD>
-			</TR>
 			<TR>	<TD>DNS</TD>
 				<TD><input type="text" id='DNS_LAN' size=14></TD>
 			</TR>
@@ -260,9 +255,6 @@
 			</TR>
 			<TR>	<TD>Max Number of Leases</TD>
 				<TD><input type="text" id='MAX_LEASE' size=14></TD>
-			</TR>
-			<TR>	<TD>Optional Router IP</TD>
-				<TD><input type="text" id='ROUTER_LAN' size=14></TD>
 			</TR>
 		</table>
 		</div>

Modified: branches/aadk/scripts/networking.sh
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/scripts/networking.sh?view=diff&rev=869&r1=868&r2=869
==============================================================================
--- branches/aadk/scripts/networking.sh (original)
+++ branches/aadk/scripts/networking.sh Fri May  4 14:42:40 2007
@@ -101,13 +101,9 @@
 	echo "max_leases ${MAX_LEASE}" >> ${DHCPD_CONFIG}
 	echo "remaining yes" >> ${DHCPD_CONFIG}
 	echo "opt subnet ${SUBNET_LAN}" >> ${DHCPD_CONFIG}
+	echo "opt router ${IP_LAN}" >> ${DHCPD_CONFIG}
 	if [ "${DNS_LAN}" != "" ]; then
 		echo "opt dns ${DNS_LAN}" >> ${DHCPD_CONFIG}
-	fi
-	if [ "${ROUTER_LAN}" != "" ]; then
-		echo "opt router ${ROUTER_LAN}" >> ${DHCPD_CONFIG}
-	else
-		echo "opt router ${IP_LAN}" >> ${DHCPD_CONFIG}
 	fi
 	if [ "${DOMAIN_LAN}" != "" ]; then
 		echo "opt domain ${DOMAIN_LAN}" >> ${DHCPD_CONFIG}