diff -r -u 0.7.0.4/bin/thinclient 0.7.1.1/bin/thinclient
--- 0.7.0.4/bin/thinclient	2006-09-01 00:32:14.000000000 +0900
+++ 0.7.1.1/bin/thinclient	2006-11-20 21:28:21.000000000 +0900
@@ -18,7 +18,7 @@
 # gather information about this machine
 WLMAC=$( ifconfig $wifi_ifname|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
 WLMAC2=$( ifconfig $lan_ifname|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
-ETMAC=$( ifconfig $wan_ifname|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
+ETMAC=$( ifconfig eth0|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
 
 FONREV="$(cat /etc/fon_revision)"
 FIRMWARE="$(cat /etc/fon_version)"

diff -r -u 0.7.0.4/etc/banner 0.7.1.1/etc/banner
--- 0.7.0.4/etc/banner	2006-09-13 02:41:30.000000000 +0900
+++ 0.7.1.1/etc/banner	2006-11-22 04:07:20.000000000 +0900
@@ -4,7 +4,7 @@
 |   |    |_______||__| |__|
 |___|
 
- Fonera Firmware (Version 0.7.0 rev 4) -------------
+ Fonera Firmware (Version 0.7.1 rev 1) -------------
   * 
   * Based on OpenWrt - http://openwrt.org
   * Powered by FON - http://www.fon.com

diff -r -u 0.7.0.4/etc/fon_revision 0.7.1.1/etc/fon_revision
--- 0.7.0.4/etc/fon_revision	2006-09-12 06:43:42.000000000 +0900
+++ 0.7.1.1/etc/fon_revision	2006-11-16 05:08:40.000000000 +0900
@@ -1 +1 @@
-4
+1

diff -r -u 0.7.0.4/etc/fon_version 0.7.1.1/etc/fon_version
--- 0.7.0.4/etc/fon_version	2006-09-01 00:32:14.000000000 +0900
+++ 0.7.1.1/etc/fon_version	2006-11-16 05:08:40.000000000 +0900
@@ -1 +1 @@
-0.7.0
+0.7.1

diff -r -u 0.7.0.4/etc/functions.sh 0.7.1.1/etc/functions.sh
--- 0.7.0.4/etc/functions.sh	2006-09-01 00:32:14.000000000 +0900
+++ 0.7.1.1/etc/functions.sh	2006-11-15 02:44:26.000000000 +0900
@@ -112,3 +112,18 @@
 	esac
 }
 
+#
+# This functions forwards a port. The next args are required:
+# $1 = WAN interface
+# $2 = Origin Port
+# $3 = Destination IP
+# $4 = Destination Port
+# $5 = protocol used
+#
+# Example: open_port $WAN 8080 192.168.1.2 80 tcp
+#
+open_port() {
+        iptables -t nat -A prerouting_rule -i $1 -p $5 --dport $2 -j DNAT --to-destination $3:$4
+        pdots=`echo $4 | sed 's/-/:/g'`
+        iptables        -A forwarding_rule -i $1 -p $5 --dport $pdots -d $3 -j ACCEPT
+}

diff -r -u 0.7.0.4/etc/init.d/S45firewall 0.7.1.1/etc/init.d/S45firewall
--- 0.7.0.4/etc/init.d/S45firewall	2006-09-01 01:30:55.000000000 +0900
+++ 0.7.1.1/etc/init.d/S45firewall	2006-11-17 22:12:29.000000000 +0900
@@ -105,3 +105,7 @@
 }
 # check if the connection is already up and add WAN_HOOK rules automatically
 env -i ACTION=ifup INTERFACE=wan /bin/sh /etc/hotplug.d/iface/20-firewall
+#
+# Forwarded ports
+#
+/etc/config/openports $WAN

diff -r -u 0.7.0.4/etc/init.d/rcS 0.7.1.1/etc/init.d/rcS
--- 0.7.0.4/etc/init.d/rcS	2006-09-12 22:16:13.000000000 +0900
+++ 0.7.1.1/etc/init.d/rcS	2006-11-15 02:44:26.000000000 +0900
@@ -21,13 +21,24 @@
 	done
 	
 	while :; do
+		lock -w /var/run/restart-services
+		
+		# just in case
+		lock -u /var/run/network-connection 
+		killall lock
+		
+		# grab the locks again
 		lock /var/run/restart-services
+		lock /var/run/network-connection
+
 		killall N50chillispot
 		killall chilli
 		killall dnsmasq
 		ifup lan_noinet
 		ifup wan
 		/etc/init.d/S45firewall
+		
+		lock -w /var/run/network-connection
 		for i in /etc/init.d/N*; do
 		  $i start 2>&1
 		done

diff -r -u 0.7.0.4/etc/sysctl.conf 0.7.1.1/etc/sysctl.conf
--- 0.7.0.4/etc/sysctl.conf	2006-09-01 00:32:14.000000000 +0900
+++ 0.7.1.1/etc/sysctl.conf	2006-11-08 03:04:39.000000000 +0900
@@ -6,3 +6,4 @@
 net.ipv4.tcp_keepalive_time=120
 net.ipv4.tcp_timestamps=0
 net.ipv4.tcp_vegas_cong_avoid=1
+net.ipv4.ip_local_port_range=4096 8192

diff -r -u 0.7.0.4/usr/lib/webif/advanced.sh 0.7.1.1/usr/lib/webif/advanced.sh
--- 0.7.0.4/usr/lib/webif/advanced.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/usr/lib/webif/advanced.sh	2006-11-15 02:44:26.000000000 +0900
@@ -1,22 +1,32 @@
 ADV_SUBMENU="
 <tr>
 	<td align=\"right\"><span class=\"submenu${sel_conn:+_sel}\">
-		<a href=\"/cgi-bin/webif/connection.sh\">Internet Connection</a>
+		<a href=\"/cgi-bin/webif/connection.sh\">@TR<<Internet Connection>></a>
 	</span></td>
 </tr>
 <tr>
 	<td align=\"right\"><span class=\"submenu${sel_net:+_sel}\">
-		<a href=\"/cgi-bin/webif/adv_net.sh\">Network Settings</a>
+		<a href=\"/cgi-bin/webif/adv_net.sh\">@TR<<Network Settings>></a>
 	</span></td>
 </tr>
 <tr>
 	<td align=\"right\"><span class=\"submenu${sel_wifi:+_sel}\">
-		<a href=\"/cgi-bin/webif/adv_wifi.sh\">Wireless Settings</a>
+		<a href=\"/cgi-bin/webif/adv_wifi.sh\">@TR<<Wireless Settings>></a>
 	</span></td>
 </tr>
+
+<tr>
+        <td align=\"right\"><span class=\"submenu${sel_port_fw:+_sel}\">
+                <a href=\"/cgi-bin/webif/adv_pf.sh\">@TR<<PF_Title|Port Forwarding>></a>
+        </span></td>
+</tr>
+
 <tr>
 	<td align=\"right\"><span class=\"submenu${sel_upgrade:+_sel}\">
-		<a href=\"/cgi-bin/webif/upgrade.sh\">Firmware Upgrade</a>
+		<a href=\"/cgi-bin/webif/upgrade.sh\">@TR<<Firmware Upgrade>></a>
 	</span></td>
 </tr>
+
 "
+
+

diff -r -u 0.7.0.4/usr/lib/webif/form.awk 0.7.1.1/usr/lib/webif/form.awk
--- 0.7.0.4/usr/lib/webif/form.awk	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/usr/lib/webif/form.awk	2006-11-17 21:48:32.000000000 +0900
@@ -25,7 +25,7 @@
 	FS="|"
 }
 
-# trim leading whitespaces 
+# trim leading whitespaces
 {
 	gsub(/^[ \t]+/,"",$1)
 }
@@ -41,7 +41,139 @@
 
 $1 ~ /^infotext/ {
 	close_field()
-	print "<p>@TR<<" $2 ">></p>"
+	print "<p >@TR<<" $2 ">></p>"
+}
+
+
+#
+# Table issues
+#
+
+$1 ~/^infotable/ {
+	close_field()
+	print "<p class=\"tableText\">@TR<<" $2 ">></p>"
+}
+
+#
+# $2: the summary of the table.
+#
+
+$1 ~ /^start_table/ {
+	close_field()
+	print "<TABLE border=\"" $2  "\" cellspacing=\"" $3 "\" cellpadding=\"" $4 "\" summary=\"" $5 "\">"
+}
+
+$1 ~ /^start_border_table/ {
+	close_field()
+	print " <tr><td bgcolor=\"FADCBF\">"
+	print "  <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">"
+	print "  <tr><td>"
+	print "      <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
+}
+
+$1 ~ /^end_border_table/ {
+	close_field()
+	print " 	</TABLE> "
+	print "  </td></tr> "
+	print "  </table> "
+	print " </td> </tr> " 
+}
+
+$1 ~ /^end_table/ {
+	close_field()
+	print "</TABLE>"
+}
+
+#
+# $2: The title of the table
+#
+$1 ~ /^table_caption/ {
+	close_field()
+	print "<tr><td ALIGN=\"CENTER\" class=\"tableText\"><EM>" $2 "</EM></TD></tr>"
+}
+
+#
+# Begins a new row to the table
+#
+$1 ~ /^add_row/ {
+	close_field()
+	print "<TR>"
+}
+
+
+$1 ~ /^end_row/ {
+	close_field()
+	print "</TR>"
+}
+#
+# Add a cell to the row:
+#	$2: height of the row
+#	$3: width of the row
+#	$4: text of the row
+$1 ~ /^add_title_cell/ {
+	close_field()
+	print "<TD bgcolor=\"FADCBF\" class=\"tableText Bold\">@TR<<" $2 ">></TD>"
+}
+
+$1 ~ /^add_normal_cell/ {
+	close_field()
+	print "<TD bgcolor=\"ffffff\" class=\"tableText\">" $2 "</TD>" 
+}
+
+$1 ~ /^add_label_cell/ {
+        close_field()
+        print "<TD valign=\"middle\" class=\"tableText\">" $2 "</TD>"
+}
+
+$1 ~ /^add_pass_cell/ {
+	close_field
+	print "<TD class=\"tableText\">"
+	print "<input id=\"" $2 "\" valign=\"middle\" type=\"password\" name=\"" $2 "\" class=\"" $3 "\" value=\"" $4 "\"/>" $5
+	print "</TD>"
+}
+
+$1 ~ /^start_select_cell/ {
+	opts = ""
+        if (onchange != "") opts = opts " onChange=\"" onchange "()\""
+	print "<TD class=\"tableText\">"
+        print "<select id=\"" $2 "\" valign=\"middle\" name=\"" $2 "\" class=\"" $4 "\"" opts ">"
+        select_id = $2
+        select_open = 1
+	select_default = $3
+}
+
+$1 ~ /^end_select_cell/ {
+	close_field()
+	print " </select></td>"
+}
+
+$1 ~ /^add_input_cell/ {
+	print "<TD class=\"tableText\">"
+	print "<input id=\"" $2 "\" valign=\"middle\" type=\"text\" name=\"" $2 "\" value=\"" $3 "\" class=\"" $4 "\"/>" $5
+	print "</TD>"
+	
+}
+
+$1 ~ /^add_button_cell/ {
+	close_field()
+	print "<TD class=\"tableText\">"
+        print "<label>&nbsp;</label><input type=\"submit\" name=\"" $2 "\" value=\"" $3  "\" class=\"plain_button_orange\" />"
+	print "</TD>"
+	
+}
+
+$1 ~ /^add_check_cell/ {
+	opts=""
+        if (onchange != "") opts = opts " onClick=\"" onchange "()\" onChange=\"" onchange "()\""
+	print "<TD class=\"tableText\">"$3
+        print "<input id=\"" $2  "\" type=\"checkbox\" name=\"" $2 "\"  " opts " class=\"" $4 "\"/>"
+	print "</TD>"
+}
+
+# Draw a line
+$1 ~ /^draw_line/ {
+	close_field()
+	print "<tr><td colspan=\"2\"><hr /></td></tr>"
 }
 
 $1 ~ /^start_div/ {
@@ -73,7 +205,7 @@
 }
 $1 ~ /^select/ {
 	opts = ""
-	if (onchange != "") opts = opts " onClick=\"" onchange "()\" onChange=\"" onchange "()\""
+	if (onchange != "") opts = opts " onChange=\"" onchange "()\""
 	print "<select id=\"" $2 "\" name=\"" $2 "\"" opts ">"
 	select_id = $2
 	select_open = 1
@@ -91,9 +223,9 @@
 $1 ~ /^string/ { print $2 }
 $1 ~ /^text/ { print "<input id=\"" $2 "\" type=\"text\" name=\"" $2 "\" value=\"" $3 "\" />" $4 }
 $1 ~ /^password/ { print "<input id=\"" $2 "\" type=\"password\" name=\"" $2 "\" value=\"" $3 "\" />" $4 }
-$1 ~ /^submit/ { 
+$1 ~ /^submit/ {
 	close_field()
-	print "<label>&nbsp;</label><input type=\"submit\" name=\"" $2 "\" value=\"" $3 "\" class=\"plain_button_orange\" />"
+	print "<label>&nbsp;</label><input type=\"submit\" name=\"" $2 "\" value=\"" $3  "\" class=\"plain_button_orange\" />"
 }
 
 ($1 ~ /^checkbox/) || ($1 ~ /^radio/) {
@@ -103,3 +235,5 @@
 END {
 	close_field()
 }
+
+

diff -r -u 0.7.0.4/usr/lib/webif/validate.awk 0.7.1.1/usr/lib/webif/validate.awk
--- 0.7.0.4/usr/lib/webif/validate.awk	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/usr/lib/webif/validate.awk	2006-11-18 03:01:48.000000000 +0900
@@ -8,14 +8,20 @@
 	output=""
 }
 
-{ 
-	valid_type = 0
-	valid = 1
-	# XXX: weird hack, but it works...
-	n = split($0, param, "|")
-	value = param[5]
-	for (i = 6; i <= n; i++) value = value FS param[i]
-	verr = ""
+{
+        valid_type = 0                                                          
+        valid = 1                                                               
+        if ( $0 ~ /[\\`\"\']/ ) {                                               
+                valid = 0                                                       
+                verr = "@TR<<Invalid value>>"                                   
+        }                                                                       
+        else {                                                                  
+        	# XXX: weird hack, but it works...                                      
+                n = split($0, param, "|")                                       
+                value = param[5]                                                
+                for (i = 6; i <= n; i++) value = value FS param[i]              
+                verr = ""                                                       
+        }
 }
 
 $1 == "int" {
@@ -36,20 +42,21 @@
 				if ((ipaddr[i] < 0) || (ipaddr[i] > 255)) valid = 0
 				if ((ipaddr[i] == 255) && ($2 != "FORM_netmask")) counter++
 			}
-			if (counter == 4) valid = 0 
+			if (counter == 4) valid = 0
 		}
 		if (valid == 0) verr = "@TR<<Invalid value>>"
 	}
 }
 
+
 $1 == "wep" {
 	valid_type = 1
 	if (value !~ /^[0-9A-Fa-f]*$/) {
 		valid = 0
-		verr = "@TR<<Invalid value>>"
+		verr = "@TR<<InvalidHex|You must use letters from 'A' to 'F' and numbers from 0 to 9.>>"
 	} else if ((length(value) != 0) && (length(value) != 10) && (length(value) != 26)) {
 		valid = 0
-		verr = "Invalid key length"
+		verr = "@TR<<InvalidLength|The key has to be either 10 or 26 characters long>>"
 	}
 }
 
@@ -69,7 +76,7 @@
 	}
 }
 $1 == "user" {
-        valid_type = 1
+	valid_type = 1
 	if (value ~ /[\<\>\&|;]/) {
 		valid = 0
 		verr = "@TR<<Invalid value>>"
@@ -97,6 +104,10 @@
 		valid = 0
 		verr = "@TR<<Invalid value>>"
 	}
+	if (value > 65535) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
 }
 
 $1 == "ports" {
@@ -114,15 +125,15 @@
 	valid_type = 1
 	if (length(value) > 64) {
 		valid = 0
-		verr = "String too long"
+		verr = "@TR<<Long|The string is too long [8-64]>>"
 	}
 	if ((length(value) != 0) && (length(value) < 8)) {
 		valid = 0
-		verr = "String too short"
+		verr = "@TR<<Sort|The string is too short [8-64]>>"
 	}
 	if ((length(value) == 64) && (value ~ /[^0-9a-fA-F]/)) {
 		valid = 0
-		verr = "Invalid hex key"
+		verr = "@TR<<InvalidHex|Invalid hex key. Use only numbers from 0 to 9 and letters from a to f>>"
 	}
 }
 
@@ -132,24 +143,24 @@
 	n = split($4, options, " ")
 	for (i = 1; (valid == 1) && (i <= n); i++) {
 		if (options[i] == "required") {
-			if (value == "") { valid = 0; verr = "No value entered" }
+			if (value == "") { valid = 0; verr = "@TR<<NoValue|No value entered>>" }
 		} else if ((options[i] ~ /^min=/) && (value != "")) {
 			min = options[i]
 			sub(/^min=/, "", min)
 			min = int(min)
 			if ($1 == "int") {
-				if (value < min) { valid = 0; verr = "Value too small (minimum: " min ")" }
+				if (value < min) { valid = 0; verr = "@TR<<TooSmallNumber|The value is too small (minimum: >>" min ")" }
 			} else if ($1 == "string") {
-				if (length(value) < min) { valid = 0; verr = "Value too small (minimum length: " min ")"}
+				if (length(value) < min) { valid = 0; verr = "@TR<<TooSmallStr|The value is too short (minimum length: >>" min ")"}
 			}
 		} else if ((options[i] ~ /^max=/) && (value != ""))  {
 			max = options[i]
 			sub(/^max=/, "", max)
 			max = int(max)
 			if ($1 == "int") {
-				if (value > max) { valid = 0; verr = "@TR<<Value too large>> (@TR<<maximum>>: " max ")" }
+				if (value > max) { valid = 0; verr = "@TR<<Value too big | The value is too big>> (@TR<<maximum>>: " max ")" }
 			} else if ($1 == "string") {
-				if (length(value) > max) { valid = 0; verr = "@TR<<String too long>> (@TR<<maximum>>: " max ")" }
+				if (length(value) > max) { valid = 0; verr = "@TR<<String too long | The string is too long>> (@TR<<maximum>>: " max ")" }
 			}
 		} else if ((options[i] == "nodots") && ($1 == "hostname")) {
 			if (value ~ /\./) {
@@ -162,7 +173,7 @@
 
 valid_type == 1 {
 	if (valid == 1) output = output $2 "=\"" value "\";\n"
-	else error = error "Error in " $3 ": " verr "<br />"
+	else error = error "@TR<<Error in>> " $3 ": " verr "<br />"
 }
 
 END {
@@ -170,3 +181,5 @@
 	if (error == "") print "return 0"
 	else print "return 255"
 }
+
+

diff -r -u 0.7.0.4/usr/lib/webif/webif.sh 0.7.1.1/usr/lib/webif/webif.sh
--- 0.7.0.4/usr/lib/webif/webif.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/usr/lib/webif/webif.sh	2006-11-15 02:44:26.000000000 +0900
@@ -42,7 +42,7 @@
 
 header() {
 	local title="$1"
-	
+
 	empty "$ERROR" && {
 		_saved_title="${SAVED:+: @TR<<Settings saved>>}"
 	} || {
@@ -72,98 +72,108 @@
 	</script>
 
 	<center>
-	<table width="80%" BORDER="0" CELLPADDING="0" CELLSPACING="0" > 
-			<tr> 
-				<td  background="/images/table/left.gif" valign="top"><img src="/images/table/top-left.gif" width="38" height="82"></td> 
+	<table width="80%" BORDER="0" CELLPADDING="0" CELLSPACING="0" >
+			<tr>
+				<td  background="/images/table/left.gif" valign="top"><img src="/images/table/top-left.gif" width="38" height="82"></td>
 			  <td rowspan="2" valign="top" width="177">
-			  	<!--NAVIGATION-->
+				<!--NAVIGATION-->
 			  <div id="sidebar">
-			  	<table width="100%" border="0" CELLPADDING="0" CELLSPACING="0">
-			  		<tr>
-			  			<td rowspan="2" width="167" height="175"><IMG SRC="/images/table/logo.gif">
-			  				<!--NAVIGATION BUTTONS-->
-			  				<table>
-			  					<tr><td>
-		  						<div class="button_orange" style="float: left;">
+				<table width="100%" border="0" CELLPADDING="0" CELLSPACING="0">
+					<tr>
+						<td rowspan="2" width="167" height="175"><IMG SRC="/images/table/logo.gif">
+							<!--NAVIGATION BUTTONS-->
+							<table>
+								<tr><td>
+								<div class="button_orange" style="float: left;">
 									<div class="btnleft"></div>
 									<a href="/cgi-bin/status.sh"></a>
 									<div class="btncenter">
-									<a href="/cgi-bin/status.sh">Status</a>
+									<a href="/cgi-bin/status.sh">@TR<<Status>></a>
 									</div>
 									<div class="btnright"></div>
 								</div>
 								</td></tr>
-			  					<tr><td>
-		  						<div class="button_orange" style="float: left;">
+								<tr><td>
+								<div class="button_orange" style="float: left;">
 									<div class="btnleft"></div>
 									<a href="/cgi-bin/webif/public.sh"></a>
 									<div class="btncenter">
-									<a href="/cgi-bin/webif/public.sh">Public WiFi</a>
+									<a href="/cgi-bin/webif/public.sh">@TR<<Public WiFi>></a>
 									</div>
 									<div class="btnright"></div>
 								</div>
 								</td></tr>
 								<tr><td>
-			  					<div class="button_orange" style="float: left;">
+								<div class="button_orange" style="float: left;">
 									<div class="btnleft"></div>
 									<a href="/cgi-bin/webif/private.sh"></a>
 									<div class="btncenter">
-									<a href="/cgi-bin/webif/private.sh">Private WiFi</a>
+									<a href="/cgi-bin/webif/private.sh">@TR<<Private WiFi>></a>
 									</div>
 									<div class="btnright"></div>
 								</div>
 								</td></tr>
 								<tr><td>
-			  						<div class="button_orange" style="float: left;">
+									<div class="button_orange" style="float: left;">
 									<div class="btnleft"></div>
 									<a href="/cgi-bin/webif/password.sh"></a>
 									<div class="btncenter">
-									<a href="/cgi-bin/webif/password.sh">Change Password</a>
+									<a href="/cgi-bin/webif/password.sh">@TR<<Password>></a>
 									</div>
 									<div class="btnright"></div>
 								</div>
 								</td></tr>
 								<tr><td>
-			  						<div class="button_orange" style="float: left;">
+                                                                        <div class="button_orange" style="float: left;">
+                                                                        <div class="btnleft"></div>
+                                                                        <a href="/cgi-bin/webif/language.sh"></a>
+                                                                        <div class="btncenter">
+                                                                        <a href="/cgi-bin/webif/language.sh">@TR<<Language>></a>
+                                                                        </div>
+                                                                        <div class="btnright"></div>
+                                                                </div>
+                                                                </td></tr>
+								<tr><td>
+									<div class="button_orange" style="float: left;">
 									<div class="btnleft"></div>
 									<a href="/cgi-bin/webif/connection.sh"></a>
 									<div class="btncenter">
-									<a href="/cgi-bin/webif/connection.sh">Advanced</a>
+									<a href="/cgi-bin/webif/connection.sh">@TR<<Advanced>></a>
 									</div>
 									<div class="btnright"></div>
 								</div>
 								</td></tr>
 								$ADV_SUBMENU
-			  				</table>
+							</table>
 							<br />
 							<br />
-			  			</td>
+						</td>
 
-			  			<td style="background: transparent url(/images/table/top.gif) repeat-x;" width="10"></td>
+						<td style="background: transparent url(/images/table/top.gif) repeat-x;" width="10"></td>
 
-			  		</tr>
-			  		<tr>
-			  			<td background="/images/table/sidebar.gif"></td>
-			  		</tr>
+					</tr>
+					<tr>
+						<td background="/images/table/sidebar.gif"></td>
+					</tr>
 			  </table>
 			  </td>
 				<td style="background: transparent url(/images/table/top.gif) repeat-x;" colspan="2" height="82">
 					<!--BEGIN MENU CODE-->
 					<table width="100%"><tr>
 						<td>
-							<h1>@TR<<$title>>$_saved_title</h1>
+							<h1><br/>@TR<<$title>>$_saved_title</h1>
 						</td>
 						<td align="right">
 						</td>
 					</tr></table>
 					<!--END MENU CODE-->
-				</td> 
-				<td  background="/images/table/right.gif" valign="top"> 
-				<img src="/images/table/top-right.gif" width="38" height="82"></td> 
-			</tr> 
-			<tr> 
-				<td background="/images/table/left.gif" width="38"> </td> 
-				<td valign="top">
+				</td>
+				<td  background="/images/table/right.gif" valign="top">
+				<img src="/images/table/top-right.gif" width="38" height="82"></td>
+			</tr>
+			<tr>
+				<td background="/images/table/left.gif" width="38"> </td>
+				<td colspan="2" valign="top" style="background: transparent url(/images/Fonera.gif); background-position: 100% 100%; background-repeat: no-repeat; " >
 				<form method="post" action="$SCRIPT_NAME" enctype="multipart/form-data">
 				<br />
 				<br />
@@ -176,22 +186,22 @@
 				<br />
 				<br />
 				</form>
-				<td valign="bottom" width="150">
+				<!--td valign="bottom" width="150">
 					<img src="/images/Fonera.gif" width="150" height="200">
-				</td>	
-				</td> 
-				<td background="/images/table/right.gif" width="38"></td> 
+				</td-->
+				</td>
+				<td background="/images/table/right.gif" width="38"></td>
 			</tr>
-			 
-			 
-			<tr> 
-			<td> 
-			<img src="/images/table/bottom-left.gif" width="38" height="39"></td> 
-			<td align="center" background="/images/table/bottom.gif" height="39" colspan="3"> </td> 
-			<td> 
-			<img src="/images/table/bottom-right.gif" width="38" height="39"></td> 
-			</tr> 
-	</table> 
+
+
+			<tr>
+			<td>
+			<img src="/images/table/bottom-left.gif" width="38" height="39"></td>
+			<td align="center" background="/images/table/bottom.gif" height="39" colspan="3"> </td>
+			<td>
+			<img src="/images/table/bottom-right.gif" width="38" height="39"></td>
+			</tr>
+	</table>
 <br />
 
 </center>
@@ -238,7 +248,7 @@
 		export cfgfile="${cfg##*config-}"
 		export updatestr=
 		. $cfg
-		
+
 		lock /tmp/.webif/update-$cfgfile
 		awk \
 			-v cfgfile="/etc/config/$cfgfile" \
@@ -257,3 +267,5 @@
 		lock -u /tmp/.webif/update-$cfgfile
 	done
 )}
+
+

diff -r -u 0.7.0.4/www/cgi-bin/splash.sh 0.7.1.1/www/cgi-bin/splash.sh
--- 0.7.0.4/www/cgi-bin/splash.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/splash.sh	2006-11-15 02:44:25.000000000 +0900
@@ -1,11 +1,11 @@
 #!/usr/bin/webif-page
-<? 
+<?
 . /usr/lib/webif/webif.sh
 
 header "No_network|No network access"
 cat <<EOF
 		<p><strong>@TR<<Splash_head1|Why am I seeing this Management Console instead of the FON Access Portal&#63;>></strong></p>
-		<p>@TR<<Splash_head2|It looks like your <strong>Fonera</strong> was not able to configure itself to your home network settings. This can be due to many different reasons:>></p><br/>	
+		<p>@TR<<Splash_head2|It looks like your <strong>Fonera</strong> was not able to configure itself to your home network settings. This can be due to many different reasons:>></p><br/>
 
 		<form id="myform" action="">
 
@@ -42,3 +42,5 @@
 EOF
 footer
 ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/status.sh 0.7.1.1/www/cgi-bin/status.sh
--- 0.7.0.4/www/cgi-bin/status.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/status.sh	2006-11-15 02:44:25.000000000 +0900
@@ -37,27 +37,28 @@
 version="$(cat /etc/fon_version) r$(cat /etc/fon_revision)"
 
 cat <<EOF
-<table width="100%">
-<tr><td colspan="2"><p><strong>Configuration summary</strong></p></td></tr>
-<tr><td>Firmware Version:</td><td>$version</td></tr>
+<table width="70%">
+<tr><td colspan="2"><p><strong>@TR<<Configuration summary>></strong></p></td></tr>
+<tr><td>@TR<<Firmware Version>>:</td><td>$version</td></tr>
 <tr><td colspan="2"><p><hr /></p></td></tr>
 
-<tr><td colspan="2"><p><strong>Internet connection</strong></p></td></tr>
-<tr><td>Connection type:</td><td>$mode</td></tr>
-<tr><td>IP Address:</td><td>${wan_ip:-N/A}</td></tr>
-<tr><td>Gateway address:</td><td>${wan_gw:-N/A}</td></tr>
-<tr><td>DNS Server:</td><td>${wan_ns:-N/A}</td></tr>
+<tr><td colspan="2"><p><strong>@TR<<Internet connection>></strong></p></td></tr>
+<tr><td>@TR<<Connection type>>:</td><td>$mode</td></tr>
+<tr><td>@TR<<IP Address>>:</td><td>${wan_ip:-N/A}</td></tr>
+<tr><td>@TR<<Gateway address>>:</td><td>${wan_gw:-N/A}</td></tr>
+<tr><td>@TR<<DNS Server>>:</td><td>${wan_ns:-N/A}</td></tr>
 </td></tr>
 
 <tr><td colspan="2"><hr /></td></tr>
 
-<tr><td colspan="2"><p><strong>WiFi Settings</strong></p></td></tr>
-<tr><td>Public SSID:</td><td>FON_$pubssid</td></tr>
-<tr><td>Private SSID:</td><td>$privssid</td></tr>
-<tr><td>Encryption:</td><td>${encryption:-none}</td></tr>
-<tr><td>IP Address:</td><td>${priv_ip:-N/A}</td></tr>
+<tr><td colspan="2"><p><strong>@TR<<WiFi Settings>></strong></p></td></tr>
+<tr><td>@TR<<Public SSID>>:</td><td>FON_$pubssid</td></tr>
+<tr><td>@TR<<Private SSID>>:</td><td>$privssid</td></tr>
+<tr><td>@TR<<Encryption>>:</td><td>${encryption:-none}</td></tr>
+<tr><td>@TR<<IP Address>>:</td><td>${priv_ip:-N/A}</td></tr>
 </td><tr><td colspan="2"><p><hr /></p></td></tr>
 </table>
 EOF
 
+
 footer ?>

diff -r -u 0.7.0.4/www/cgi-bin/webif/adv_net.sh 0.7.1.1/www/cgi-bin/webif/adv_net.sh
--- 0.7.0.4/www/cgi-bin/webif/adv_net.sh	2006-09-12 22:16:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/adv_net.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,7 +1,17 @@
 #!/usr/bin/webif-page
-<? 
+<?
 . /usr/lib/webif/webif.sh
 
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
+
 config_load fon
 if empty "$FORM_submit"; then
 	get_default ipaddr lan ipaddr
@@ -11,10 +21,16 @@
 	get_default hs_lan access hotspot_lan
 	get_default hs_wan access hotspot_wan
 else
-	validate <<EOF
+
+validate <<EOF
 ip|FORM_ipaddr|@TR<<IP Address>>|required|$FORM_ipaddr
 ip|FORM_netmask|@TR<<Netmask>>|required|$FORM_netmask
+int|FORM_dhcp|@TR<<DHCP Server>>|required|$FORM_dhcp
+int|FORM_lan_wan|@TR<<Private->WAN>>|required|$FORM_lan_wan
+int|FORM_hs_lan|@TR<<Public->Private>>|required|$FORM_hs_lan
+int|FORM_hs_wan|@TR<<Public->WAN>>|required|$FORM_hs_wan
 EOF
+
 	equal "$?" 0 && {
 		save_setting fon lan ipaddr "$FORM_ipaddr"
 		save_setting fon lan netmask "$FORM_netmask"
@@ -24,44 +40,68 @@
 		save_setting fon access hotspot_wan "$FORM_hs_wan"
 		commit_settings
 		lock -u /var/run/restart-services
+		lock -u /var/run/network-connection
 		SAVED=1
 	}
 fi
 
-
+	
 sel_net=1
 . /usr/lib/webif/advanced.sh
 header "Advanced Network Settings"
 
 display_form <<EOF
-intotext|Private Wireless IP Settings
-field|IP Address
-text|ipaddr|$FORM_ipaddr
-field|Netmask
-text|netmask|$FORM_netmask
-
-field|DHCP Server
-select|dhcp|$FORM_dhcp
-option|1|enabled
-option|0|disabled
-
-infotext|Firewall settings
-field|Public->Private
-select|hs_lan|$FORM_hs_lan
-option|1|Allow
-option|0|Deny
-
-field|Public->WAN
-select|hs_wan|$FORM_hs_wan
-option|1|Allow
-option|0|Deny
-
-field|Private->WAN
-select|lan_wan|$FORM_lan_wan
-option|1|Allow
-option|0|Deny
-
-submit|submit|Submit
+	infotable|Private Wireless IP Settings
+	start_table|0|10|5
+		add_row
+			add_label_cell|@TR<<IP Address>>
+			add_input_cell|ipaddr|$FORM_ipaddr|tableTextButton
+		end_row
+		add_row
+			add_label_cell|@TR<<Netmask>>
+			add_input_cell|netmask|$FORM_netmask|tableTextButton
+		end_row
+		add_row
+			add_label_cell|@TR<<DHCP Server>>
+			start_select_cell|dhcp|$FORM_dhcp|tableTextSelect
+				option|1|@TR<<enabled>>
+				option|0|@TR<<disabled>>
+			end_select_cell
+		end_row
+	end_table
+
+	infotable|Firewall settings
+	infotable|FirewallInfo#Here you can configure the access policies between your different networks.
+	start_table|0|10|5
+		add_row
+			add_label_cell|@TR<<Public->Private>>
+			start_select_cell|hs_lan|$FORM_hs_lan|tableTextSelect
+				option|1|@TR<<Allow>>
+				option|0|@TR<<Deny>>
+			end_select_cell
+		end_row
+		add_row
+			add_label_cell|@TR<<Public->WAN>>
+			start_select_cell|hs_wan|$FORM_hs_wan|tableTextSelect
+				option|1|@TR<<Allow>>
+				option|0|@TR<<Deny>>
+			end_select_cell
+		end_row
+		add_row
+			add_label_cell|@TR<<Private->WAN>>
+			start_select_cell|lan_wan|$FORM_lan_wan|tableTextSelect
+				option|1|@TR<<Allow>>
+				option|0|@TR<<Deny>>
+			end_select_cell
+		end_row
+	end_table
+	start_table|0|10|5
+		add_row
+			add_button_cell|submit|@TR<<Submit>>|tableTextButton
+		end_row
+	end_table
 EOF
 
 footer ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/adv_wifi.sh 0.7.1.1/www/cgi-bin/webif/adv_wifi.sh
--- 0.7.0.4/www/cgi-bin/webif/adv_wifi.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/adv_wifi.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,31 +1,52 @@
 #!/usr/bin/webif-page
-<? 
+<?
 . /usr/lib/webif/webif.sh
 
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 sel_wifi=1
 . /usr/lib/webif/advanced.sh
 
 config_load fon
 if empty "$FORM_submit"; then
-	get_default wifimode advanced bgmode
+	get_default bgmode advanced bgmode
 	get_default channel advanced channel
 else
-	save_setting fon advanced bgmode "$FORM_wifimode"
+validate <<EOF
+string|FORM_bgmode|@TR<<BGMode#b/g Mode>>|required|$FORM_bgmode
+user|FORM_bgmode|@TR<<BGMode#b/g Mode>>|required|$FORM_bgmode
+string|FORM_channel|@TR<<Channel>>|required|$FORM_channel
+EOF
+	equal "$?" 0 && {
+	if [ "$FORM_bgmode" == "b" ]
+	then
+		save_setting fon advanced bgmode "mixed"
+	else
+		save_setting fon advanced bgmode "$FORM_bgmode"
+	fi
 	save_setting fon advanced channel "$FORM_channel"
 	commit_settings
-	( 
+	(
 		ifconfig ath0 down
 		ifconfig ath1 down
 		ifup lan
 		ifconfig ath0 up
 	) >/dev/null 2>/dev/null &
 	SAVED=1
+	}
 fi
 
 header "Advanced Wireless Settings"
 
 channels=
-for ch in $(iwlist ath1 freq | grep 'Channel ' | awk '{print $2}'); do
+for ch in $(iwlist ath1 freq | grep 'Channel ' | grep -v "reque" | awk '{print $2}'); do
 	channels="${channels:+$channels$N}option|$ch|$ch"
 done
 
@@ -44,19 +65,30 @@
 option|11|11}"
 
 display_form <<EOF
-infotext|Advanced_wifi#The values in this page will permit you configure very specific WiFi paramters of La Fonera. All of them are optional
-field|Channel
-select|channel|$FORM_channel
-option|auto|Automatic
-$channels
-
-field|BGMode#B/G Mode
-select|wifimode|$FORM_wifimode
-option|mixed|Mixed (B/G)
-option|g|G only
-option|b|B only
+	infotable|Advanced_wifi#The values in this page will permit you configure very specific WiFi paramters of La Fonera. All of them are optional
 
-submit|submit|Submit
+	start_table|0|10|5
+		add_row
+			add_label_cell|@TR<<Channel>>
+			start_select_cell|channel|$FORM_channel|tableTextSelect
+				option|auto|@TR<<Automatic>>
+				$channels
+			end_select_cell
+		end_row
+		add_row
+			add_label_cell|@TR<<BGMode#b/g Mode>>
+			start_select_cell|bgmode|$FORM_bgmode|tableTextSelect
+				option|mixed|@TR<<Mixed (b/g)>>
+				option|g|@TR<<g only>>
+				option|b|@TR<<b only>>
+			end_select_cell
+		end_row
+		add_row
+			add_button_cell|submit|@TR<<Submit>>|tableTextButton
+		end_row
+	end_table
 EOF
 
 footer ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/connection.sh 0.7.1.1/www/cgi-bin/webif/connection.sh
--- 0.7.0.4/www/cgi-bin/webif/connection.sh	2006-09-12 22:16:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/connection.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,7 +1,16 @@
 #!/usr/bin/webif-page
 <?
 . /usr/lib/webif/webif.sh
- 
+
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 load_settings fon
 if empty "$FORM_submit"; then
 	get_default mode wan mode
@@ -13,6 +22,12 @@
 	get_default password wan password
 	get_default pptp_server wan server
 else
+	FORM_mode=$(echo -e "$FORM_mode" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
+	FORM_ip=$(echo -e "$FORM_ip" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
+	FORM_netmask=$(echo -e "$FORM_netmask" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
+	FORM_gateway=$(echo -e "$FORM_gateway" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
+	FORM_dns=$(echo -e "$FORM_dns" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
+	FORM_pptp_server=$(echo -e "$FORM_pptp_server" |sed s/\`//g|sed s/\"//g |sed s/\'//g)
 	case "$FORM_mode" in
 		static)
 			V_S="required"
@@ -25,9 +40,9 @@
 			V_PPTP="required"
 		;;
 	esac
-	FORM_username=$(echo -e "$FORM_username" |sed s/\`//g|sed s/\"//g)
-        FORM_password=$(echo -e "$FORM_password" |sed s/\`//g|sed s/\"//g)
+
 	validate <<EOF
+string|FORM_mode|@TR<<Mode>>||$FORM_mode
 ip|FORM_ip|@TR<<IP Address>>|$V_S|$FORM_ip
 ip|FORM_netmask|@TR<<Netmask>>|$V_S|$FORM_netmask
 ip|FORM_dns|@TR<<DNS Address>>|$V_S|$FORM_dns
@@ -61,6 +76,7 @@
 		esac
 		commit_settings
 		lock -u /var/run/restart-services
+		lock -u /var/run/network-connection
 		SAVED=1
 	}
 fi
@@ -81,46 +97,78 @@
 }
 -->
 </script>
-
-<p>Here you can configure the way your Fonera connects to the Internet. Currently there are 4 protocols available: DHCP, static IP configuration, PPPoE and PPTP. For most people DHCP should work; though, if it doesn't for you, check with your Internet provider (ISP) what protocol you must use or look at the installation reference manual or the troubleshooting manual from FON.</p>
 EOF
 
 display_form <<EOF
-onchange|modechange
-field|Mode
-select|mode|$FORM_mode
-option|dhcp|DHCP
-option|static|Static IP
-option|pppoe|PPPoE
-option|pptp|PPTP
-
-start_div|static
-infotext|Static IP settings
-field|IP Address
-text|ip|$FORM_ip
-field|Network Mask
-text|netmask|$FORM_netmask
-field|Gateway
-text|gateway|$FORM_gateway
-field|DNS server
-text|dns|$FORM_dns
-end_div
-
-start_div|ppp
-infotext|PPPoE and PPTP settings
-field|Username
-text|username|$FORM_username
-field|Password
-text|password|$FORM_password
-end_div ppp
-
-start_div|pptp
-infotext|PPTP
-field|PPTP Server IP
-text|pptp_server|$FORM_pptp_server
-end_div pptp
-
-submit|submit|Submit
+	infotable|Connection_help#Here you can configure the way your Fonera connects to the Internet. Currently there are 4 protocols available: DHCP, static IP configuration, PPPoE and PPTP. For most people DHCP should work; though, if it doesn't for you, check with your Internet provider (ISP) what protocol you must use or look at the installation reference manual or the troubleshooting manual from FON.
+	start_table|0|10|5
+		add_row
+			onchange|modechange
+			add_label_cell|@TR<<Mode>>
+			start_select_cell|mode|$FORM_mode|tableTextSelect
+				option|dhcp|DHCP
+				option|static|@TR<<Static IP>>
+				option|pppoe|PPPoE
+				option|pptp|PPTP
+			end_select_cell
+		end_row
+	end_table
+	
+	start_div|static
+		start_table|0|10|5
+			add_row
+				infotable|Static IP settings
+			end_row
+			add_row
+				add_label_cell|@TR<<IP Address>>
+				add_input_cell|ip|$FORM_ip|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Network Mask>>
+				add_input_cell|netmask|$FORM_netmask|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Gateway>>
+				add_input_cell|gateway|$FORM_gateway|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<DNS Server>>
+				add_input_cell|dns|$FORM_dns|tableTextButton
+			end_row
+		end_table
+	end_div
+	
+	start_div|ppp
+		start_table|0|10|5
+			add_row
+				infotable|PPPoE and PPTP settings
+			end_row
+			add_row
+				add_label_cell|@TR<<Username>>
+				add_input_cell|username|$FORM_username|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Password>>
+				add_input_cell|password|$FORM_password|tableTextButton
+			end_row
+		end_table
+	end_div ppp
+	
+	start_div|pptp
+		start_table|0|10|5
+			add_row
+				infotable|PPTP Settings
+			end_row
+			add_row
+				add_label_cell|@TR<<PPTP Server IP>>
+				add_input_cell|pptp_server|$FORM_pptp_server|tableTextButton
+			end_row
+		end_table
+	end_div pptp
+	
+	start_table|0|10|5
+		add_button_cell|submit|@TR<<Submit>>
+	end_table
 EOF
 
 cat <<EOF
@@ -133,3 +181,5 @@
 
 footer
 ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/password.sh 0.7.1.1/www/cgi-bin/webif/password.sh
--- 0.7.0.4/www/cgi-bin/webif/password.sh	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/password.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,14 +1,25 @@
 #!/usr/bin/webif-page
-<? 
+<?
 . /usr/lib/webif/webif.sh
 
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 empty "$FORM_submit" || {
-	validate <<EOF
+
+validate <<EOF
 string|FORM_pw1|Password|required min=5|$FORM_pw1
+string|FORM_pw2|Password|required min=5|$FORM_pw2
 EOF
 	equal "$?" 0 && {
 		equal "$FORM_pw1" "$FORM_pw2" || {
-			ERROR="$ERROR Passwords do not match<br />"
+			ERROR="$ERROR @TR<<Pass_error|The passwords do not match>><br />"
 		}
 		empty "$ERROR" && {
 			RES=$(
@@ -17,9 +28,13 @@
 					sleep 1
 					echo "$FORM_pw2"
 				) | passwd root 2>&1
-				SAVED=1
 			)
-			equal "$?" 0 || ERROR="<pre>$RES</pre>"
+			if [ "$?" = 0 ];
+			then
+				SAVED=1
+			else
+				ERROR="<pre>$RES</pre>"
+			fi
 		}
 	}
 }
@@ -27,12 +42,22 @@
 header "Password Change"
 
 display_form <<EOF
-infotext|Username_info#The username is 'admin' by default and cannot be changed
-field|New Password
-password|pw1
-field|Confirm Password
-password|pw2
-submit|submit|Change
+	infotable|Username_info#The username is 'admin' by default and cannot be changed
+	start_table|0|10|5
+		add_row
+			add_label_cell|@TR<<New Password>>
+			add_pass_cell|pw1|tableTextButton
+		end_row
+		add_row
+			add_label_cell|@TR<<Confirm Password>>
+			add_pass_cell|pw2|tableTextButton
+		end_row
+		add_row
+			add_button_cell|submit|@TR<<Change>>
+		end_row
+	end_table
 EOF
 
 footer ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/private.sh 0.7.1.1/www/cgi-bin/webif/private.sh
--- 0.7.0.4/www/cgi-bin/webif/private.sh	2006-09-13 00:39:32.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/private.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,7 +1,16 @@
 #!/usr/bin/webif-page
 <?
 . /usr/lib/webif/webif.sh
- 
+
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 load_settings fon
 if empty "$FORM_submit"; then
 	get_default ssid private essid
@@ -33,7 +42,7 @@
 			eval "V_K$FORM_wepkey=required"
 		;;
 	esac
-        FORM_ssid=$(echo -e "$FORM_ssid" |sed s/\`//g|sed s/\"//g)
+
 	validate <<EOF
 string|FORM_ssid|@TR<<ESSID>>|required max=28|$FORM_ssid
 user|FORM_ssid|@TR<<ESSID>>||$FORM_ssid
@@ -48,6 +57,7 @@
 user|FORM_key3|@TR<<WEP Key>> 3||$FORM_key3
 wep|FORM_key4|@TR<<WEP Key>> 4|$V_K4|$FORM_key4
 user|FORM_key4|@TR<<WEP Key>> 4||$FORM_key4
+int|FORM_wepkey|@TR<<WEP Idx Key>>|required|$FORM_wepkey
 EOF
 	equal "$?" 0 && {
 		save_setting fon private essid "$FORM_ssid"
@@ -90,52 +100,79 @@
 EOF
 
 display_form <<EOF
-info|PRE_PRIV_SSID#This is the name of the signal for your personal use.
-onchange|modechange
-
-field|SSID#Name (SSID)
-text|ssid|$FORM_ssid
-
-field|Authentication
-select|auth|$FORM_auth
-option|open|Open
-option|wep|WEP
-option|wpa|WPA
-option|wpa2|WPA2
-option|mixed|WPA/WPA2-Mixed
-
-start_div|wpa_stuff
-field|Cipher
-select|crypto|$FORM_crypto
-option|tkip+aes|Mixed
-option|tkip|TKIP
-option|aes|AES
-
-field|WPA Passphrase
-text|psk|$FORM_psk
-end_div
-
-start_div|wep_stuff
-field|Use key
-select|wepkey|$FORM_wepkey
-option|1|1
-option|2|2
-option|3|3
-option|4|4
-
-field|Key 1
-text|key1|$FORM_key1
-field|Key 2
-text|key2|$FORM_key2
-field|Key 3
-text|key3|$FORM_key3
-field|Key 4
-text|key4|$FORM_key4
-end_div
-
-submit|submit|Submit
+	infotable|PRE_PRIV_SSID#This is the name of the signal for your personal use.
+	
+	start_table|0|10|5
+		onchange|modechange
+		add_row
+			add_label_cell|@TR<<SSID#Name (SSID)>>
+			add_input_cell|ssid|$FORM_ssid|tableTextButton
+		end_row
+		add_row
+			add_label_cell|@TR<<Authentication>>
+			start_select_cell|auth|$FORM_auth|tableTextSelect
+				option|open|@TR<<Open>>
+				option|wep|WEP
+				option|wpa|WPA
+				option|wpa2|WPA2
+				option|mixed|@TR<<WPA/WPA2-Mixed>>
+			end_select_cell
+		end_row
+	end_table
+
+	start_div|wpa_stuff
+		start_table|0|10|5
+			add_row
+				add_label_cell|@TR<<Cipher>>
+				start_select_cell|crypto|$FORM_crypto|tableTextSelect
+					option|tkip+aes|@TR<<Mixed>>
+					option|tkip|TKIP
+					option|aes|AES
+				end_select_cell
+			end_row
+			add_row
+				add_label_cell|@TR<<WPA Passphrase>>
+				add_input_cell|psk|$FORM_psk|tableTextButton
+			end_row
+		end_table
+	end_div
+	
+	start_div|wep_stuff
+		start_table|0|10|5
+			add_row
+				add_label_cell|@TR<<Use key>>
+				start_select_cell|wepkey|$FORM_wepkey|tableTextSelect
+					option|1|1
+					option|2|2
+					option|3|3
+					option|4|4
+				end_select_cell
+			end_row
+			add_row	
+				add_label_cell|@TR<<Key 1>>
+				add_input_cell|key1|$FORM_key1|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Key 2>>
+				add_input_cell|key2|$FORM_key2|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Key 3>>
+				add_input_cell|key3|$FORM_key3|tableTextButton
+			end_row
+			add_row
+				add_label_cell|@TR<<Key 4>>
+				add_input_cell|key4|$FORM_key4|tableTextButton
+			end_row
+		end_table
+	end_div
+	start_table|0|10|5
+		add_row	
+			add_button_cell|submit|@TR<<Submit>>
+		end_row
+	end_table
 EOF
- 
+
 cat <<EOF
 <script>
 <!--
@@ -146,3 +183,5 @@
 
 footer
 ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/public.sh 0.7.1.1/www/cgi-bin/webif/public.sh
--- 0.7.0.4/www/cgi-bin/webif/public.sh	2006-09-13 00:25:21.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/public.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,13 +1,21 @@
 #!/usr/bin/webif-page
 <?
 . /usr/lib/webif/webif.sh
- 
+
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 load_settings fon
 
 if empty "$FORM_submit"; then
 	get_default ssid public essid
 else
-	FORM_ssid=$(echo -e "$FORM_ssid" |sed s/\`//g|sed s/\"//g)
 	validate <<EOF
 string|FORM_ssid|@TR<<ESSID>>|required max=28|$FORM_ssid
 user|FORM_ssid|@TR<<ESSID>>||$FORM_ssid
@@ -21,14 +29,21 @@
 fi
 
 header "Pub_Title#Public Wireless Settings"
- 
+
 display_form <<EOF
-infotext|PRE_PUB_SSID#This is the name of the signal the rest of the foneros will connect to. It will be automatically prefixed with the 'FON_' string
-field|SSID#Signal name (SSID)
-string|FON_
-text|ssid|$FORM_ssid
-submit|submit|Submit
+	infotable|PRE_PUB_SSID#This is the name of the signal the rest of the foneros will connect to. It will be automatically prefixed with the 'FON_' string
+	start_table|0|10|5
+		add_row
+			add_label_cell|@TR<<SSID#Signal name (SSID)>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;FON_
+			add_input_cell|ssid|$FORM_ssid|tableTextButton
+		end_row
+		add_row
+			add_button_cell|submit|@TR<<Submit>>
+		end_row
+	end_table
 EOF
- 
+
 footer
 ?>
+
+

diff -r -u 0.7.0.4/www/cgi-bin/webif/upgrade.sh 0.7.1.1/www/cgi-bin/webif/upgrade.sh
--- 0.7.0.4/www/cgi-bin/webif/upgrade.sh	2006-09-12 04:32:00.000000000 +0900
+++ 0.7.1.1/www/cgi-bin/webif/upgrade.sh	2006-11-23 20:54:21.000000000 +0900
@@ -1,20 +1,29 @@
 #!/usr/bin/webif-page -p /bin/sh
 . /usr/lib/webif/webif.sh
 
+validate <<EOF
+user|FORM_submit|@TR<<Submit>>||$FORM_submit
+EOF
+
+if [ "$?" != "0" ]
+then
+	FORM_submit=""
+fi
+
 sel_upgrade=1
 . /usr/lib/webif/advanced.sh
 header "Upgrade_Title#Firmware upgrade and hotfix installation"
 
 stop_services_and_save_configuration()
 {
-	echo "Stopping services..."
+	echo "@TR<<Stop_Services|Stopping services...>>"
 	ps | grep N50chillispot | awk '{ print $1 }' | xargs kill -KILL
 	ps | grep -vE 'Command|init|\[[kbmj]|httpd|haserl|bstrip|bin/sh|awk|kill|ps|webif|watchdog' | awk '{ print $1 }' | xargs kill -KILL
 	MEMFREE="$(awk 'BEGIN{ mem = 0 } ($1 == "MemFree:") || ($1 == "Cached:") {mem += int($2)} END{print mem}' /proc/meminfo)"
-	echo "Freed memory $MEMFREE"
+	echo "@TR<<Freedmem|Freed memory >>$MEMFREE"
 	CWD=$(pwd)
 	cd /jffs
-	echo "Saving configuration..."
+	echo "@TR<<Savingconf|Saving configuration...>>"
 	tar czf /tmp/config.tar.gz /etc/config/
 	mtd write /tmp/config.tar.gz config > /dev/null
 	cd $CWD
@@ -29,8 +38,8 @@
 		dd bs=4 count=1 > /tmp/upgrade.fon 2> /dev/null
 		MAGIC_NUMBER=$(cat /tmp/upgrade.fon)
 		if [ "$MAGIC_NUMBER" = "FON3" ]; then
-			echo "</pre><p> Wait for the router to reflash itself. "
-			echo "This can take up to some minutes. "
+			echo "</pre><p>@TR<<Wait4reflash| Wait for the router to reflash itself. >>"
+			echo "@TR<<Waitminute|This can take up to some minutes. >>"
 			echo "<pre>"
 			stop_services_and_save_configuration
 			touch /tmp/restart_on_failure
@@ -38,9 +47,9 @@
 		elif [ "$MAGIC_NUMBER" = "FON4" ]; then
 			cat >> /tmp/upgrade.fon
 		else
-			echo "</pre><p><b>This is not a FON upgrade image or hotfix. Retry with another file</b></p>"
-			echo "<p>Press <a href="/">here</a> to return to the index page</p>"
-                        footer
+			echo "</pre><p><b>@TR<<Error_upgrade|This is not a FON upgrade image or hotfix. Retry with another file>></b></p>"
+			echo "<p><pre>@TR<<ReturnIndex|Press <a href="/">here</a> to return to the index page>></p>"
+			footer
 			touch /tmp/do_not_verify
 			exit 1
 		fi
@@ -53,24 +62,24 @@
 	RESULT=$?
 	echo "</pre>"
 	if [ "$RESULT" -eq 0 ]; then
-		echo -n "The upgrade process was successful"
+		echo -n "@TR<<Upgrade_success|The upgrade process was successful>>"
 		if [ "$MAGIC_NUMBER" = "FON1" ]; then
 			echo "<p>...</p>"
 		else
-			echo "</pre><p>Press <a href="/">here</a> to return to the index page</p>"
+			echo "</pre><p>@TR<<ReturnIndex|Press <a href="/">here</a> to return to the index page>></p>"
 		fi
 	else
-		echo -n "<b>The upgrade process did not succeed.</b>"
-		echo "</pre><p>Check if the .fon upgrade you are installing is valid for this firmware version and router model</p>"
+		echo -n "<b>@TR<<Upgrade_failed|The upgrade process did not succeed.>></b>"
+		echo "</pre><p>@TR<<Upgrade_error2|Check if the .fon upgrade you are installing is valid for this firmware version and router model>></p>"
 		if [ ! -f /tmp/restart_on_failure ];
 		then
-			echo "<p>Press <a href="/">here</a> to return to the index page</p>"
+			echo "<p>@TR<<ReturnIndex|Press <a href="/">here</a> to return to the index page>></p>"
 		else
-			echo "<pre>Restarting services...</pre>"
+			echo "<pre>@TR<<RestartServices|Restarting services...>></pre>"
 			for script in /etc/init.d/S[23456789]* /etc/init.d/N*; do
 				$script start > /dev/null 2> /dev/null
 			done
-			echo "<pre>done</pre>"
+			echo "<pre>@TR<<done>></pre>"
 		fi
 	fi
 	footer
@@ -95,7 +104,7 @@
 
 cat <<EOF
 	<script type="text/javascript">
-	
+
 function statusupdate() {
 	document.getElementById("form_submit").style.display = "none";
 	document.getElementById("status_text").style.display = "inline";
@@ -106,20 +115,23 @@
 	document.write('<div style="display: none; font-size: 14pt; font-weight: bold;" id="status_text" />@TR<<Upgrading...>>&nbsp;</div>');
 }
 	</script>
+
 	<form method="POST" name="upgrade" action="$SCRIPT_NAME$PATH_INFO" enctype="multipart/form-data" onSubmit="statusupdate()">
 	<table style="width: 90%; text-align: left;" border="0" cellpadding="2" cellspacing="2" align="center">
 	<tbody>
 		<tr>
 			<td>@TR<<Package_selection|FON upgrade file>></td>
+			<td></td>
+		</tr>
+		<tr>
 			<td>
 				<input type="file" name="firmware" />
 			</td>
 		</tr>
 		<tr>
-			<td />
 			<td>
 				<script type="text/javascript">printStatus()</script>
-				<input id="form_submit" type="submit" name="submit" value="@TR<<Upgrade>>" onClick="statusupdate()" />
+				<input id="form_submit" type="submit" name="submit" value="@TR<<Upgrade>>" onClick="statusupdate()" class="tableTextButton"/>
 			</td>
 		</tr>
 	</tbody>
@@ -133,7 +145,7 @@
 	empty "$BOUNDARY" && ERR=1
 
 	empty "$ERR" || {
-		echo "Wrong data format"
+		echo "@TR<<Wrong format|Wrong data format>>"
 		footer
 		exit
 	}
@@ -160,3 +172,5 @@
 
 footer
 
+
+

diff -r -u 0.7.0.4/www/style.css 0.7.1.1/www/style.css
--- 0.7.0.4/www/style.css	2006-09-01 00:32:13.000000000 +0900
+++ 0.7.1.1/www/style.css	2006-11-17 21:48:32.000000000 +0900
@@ -146,7 +146,7 @@
 	background-color:black;
 	background-image: url(images/button/plain_button_orange.gif);
 	font: 12px "Trebuchet MS", Tahoma, Geneva, Arial, Helvetica, sans-serif;color: #000;
-	color: #cc6633;
+	color: #666666;
 	border:1px solid #cc6633;
 	margin-top:2px;
 	height:20px;
@@ -189,3 +189,44 @@
 .submenu_sel {
 	font-weight: bold;
 }
+
+
+/* Port forwarding table */
+.inputIP {
+        width: 90px;
+        margin-bottom: 5px;
+        border:1px solid #EF8A12;
+	font-size:10px;font-weight:bold;color:000;border-color:CA5C03;background-color:FFDD83
+}
+
+.inputPort {
+        width: 45px;
+        margin-bottom: 5px;
+        border:1px solid #EF8A12;
+        font-size:10px;font-weight:bold;color:000;border-color:CA5C03;background-color:FFDD83
+}
+
+.tableText {
+   font-size: 10pt;
+   color: #000;
+   padding: 0px 6px;   }
+.Bold {
+   font-size: 10pt;
+   font-weight:bold;
+}
+.tableTextSelect {
+   font-size:10px;color:000;background-color:FEF4EB
+}
+.tableTextInput {
+   font-size:10px;color:000;border-color:CA5C03;background-color:FFDD83
+}
+.tableTextButton {
+ font-size:10px;font-weight:bold;color:000;border-color:CA5C03;background-color:FFDD83
+}
+
+.tableCheckBox {
+	width: 10px;
+	height: 10px;
+	font-weight:bold;
+	border:1px solid #000000
+}