diff -r -u 0.7.1.1/etc/banner 0.7.1.2/etc/banner
--- 0.7.1.1/etc/banner	2006-11-22 04:07:20.000000000 +0900
+++ 0.7.1.2/etc/banner	2006-12-21 23:40:04.000000000 +0900
@@ -4,7 +4,7 @@
 |   |    |_______||__| |__|
 |___|
 
- Fonera Firmware (Version 0.7.1 rev 1) -------------
+ Fonera Firmware (Version 0.7.1 rev 2) -------------
   * 
   * Based on OpenWrt - http://openwrt.org
   * Powered by FON - http://www.fon.com

diff -r -u 0.7.1.1/etc/fon_revision 0.7.1.2/etc/fon_revision
--- 0.7.1.1/etc/fon_revision	2006-11-16 05:08:40.000000000 +0900
+++ 0.7.1.2/etc/fon_revision	2006-12-21 23:39:58.000000000 +0900
@@ -1 +1 @@
-1
+2

diff -r -u 0.7.1.1/etc/init.d/N45ntpclient 0.7.1.2/etc/init.d/N45ntpclient
--- 0.7.1.1/etc/init.d/N45ntpclient	2006-11-21 02:36:14.000000000 +0900
+++ 0.7.1.2/etc/init.d/N45ntpclient	2006-12-21 21:57:40.000000000 +0900
@@ -5,6 +5,9 @@
 crontab_file="/etc/crontabs/root"
 ntp_file="/etc/config/ntpservers"
 
+#Flush previous ntp servers...
+cat /etc/crontabs/root | grep -v ntp > /etc/crontabs/root
+
 randline=$(expr `head -c1 /dev/urandom | hexdump -d | sed 's/\ //g' | sed 's/^0*//' | head -n1` % `wc -l $ntp_file | sed 's/^\ [ \t]*//' | cut -d" " -f1`)
 
 ntpserver=$(head -n$randline $ntp_file | tail -n1)
@@ -25,6 +28,6 @@
 randminute=$(expr `head -c2 /dev/urandom | hexdump -d | sed 's/\ //g' | sed 's/^0*//' | head -n1` % 60)
 randhour=$(expr `head -c2 /dev/urandom | hexdump -d | sed 's/\ //g' | sed 's/^0*//' | head -n1` % 24)
 echo "$randminute $randhour * * * ntpclient -s -h $ntpserver" >> $crontab_file
-ntpclient -s -h $ntpserver 
+ntpclient -s -h $ntpserver &
 crontab -l
 
diff -r -u 0.7.1.1/usr/lib/webif/validate.awk 0.7.1.2/usr/lib/webif/validate.awk
--- 0.7.1.1/usr/lib/webif/validate.awk	2006-11-18 03:01:48.000000000 +0900
+++ 0.7.1.2/usr/lib/webif/validate.awk	2006-12-21 22:20:29.000000000 +0900
@@ -11,7 +11,7 @@
 {
         valid_type = 0                                                          
         valid = 1                                                               
-        if ( $0 ~ /[\\`\"\']/ ) {                                               
+        if ( $0 ~ /\|@$|['`"$%&()]/ ) { 
                 valid = 0                                                       
                 verr = "@TR<<Invalid value>>"                                   
         }                                                                       
@@ -29,6 +29,10 @@
 	if (value !~ /^[0-9]*$/) { valid = 0; verr = "@TR<<Invalid value>>" }
 }
 
+$1 == "string" {
+	valid_type = 1
+}
+
 # FIXME: add proper netmask validation
 ($1 == "ip") || ($1 == "netmask") {
 	valid_type = 1
@@ -75,20 +79,6 @@
 		verr = "@TR<<Invalid value>>"
 	}
 }
-$1 == "user" {
-	valid_type = 1
-	if (value ~ /[\<\>\&|;]/) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	}
-}
-$1 == "string" {
-	if (value ~ /;/) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	}
-	valid_type = 1
-}
 
 $1 == "mac" {
 	valid_type = 1
@@ -137,6 +127,78 @@
 	}
 }
 
+#$1 == "submit" {
+#	valid_type = 1
+#	if (value !~ /[S|s]ubmit/) {
+#		valid = 0
+#		verr = "@TR<<Invalid value>>"
+#	}
+#}
+
+$1 == "bool" {
+	valid_type = 1
+	if (value !~ /^[01]$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "add_remove" {
+	valid_type = 1
+	if (value !~ /^(add|remove)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "tcp_udp" {
+	valid_type = 1
+	if (value !~ /^(tcp|udp|both)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "chk_bgmode" {
+	valid_type = 1
+	if (value !~ /^(g|b|mixed)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "chk_channel" {
+	valid_type = 1
+	if (value !~ /^([01][0-9]|auto)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "conn_type" {
+	valid_type = 1
+	if (value !~ /^(dhcp|static|pppoe|pptp)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+		
+$1 == "chk_auth" {
+	valid_type = 1
+	if (value !~ /^(wpa|wpa2|mixed|wep|open)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
+$1 == "chk_crypto" {
+	valid_type = 1
+	if (value !~ /^(tkip\+aes|tkip|aes)$/) {
+		valid = 0
+		verr = "@TR<<Invalid value>>"
+	}
+}
+
 valid_type != 1 { valid = 0 }
 
 valid == 1 {

diff -r -u 0.7.1.1/www/cgi-bin/webif/adv_net.sh 0.7.1.2/www/cgi-bin/webif/adv_net.sh
--- 0.7.1.1/www/cgi-bin/webif/adv_net.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/adv_net.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -25,10 +25,10 @@
 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
+bool|FORM_dhcp|@TR<<DHCP Server>>|required|$FORM_dhcp
+bool|FORM_lan_wan|@TR<<Private->WAN>>|required|$FORM_lan_wan
+bool|FORM_hs_lan|@TR<<Public->Private>>|required|$FORM_hs_lan
+bool|FORM_hs_wan|@TR<<Public->WAN>>|required|$FORM_hs_wan
 EOF
 
 	equal "$?" 0 && {

diff -r -u 0.7.1.1/www/cgi-bin/webif/adv_pf.sh 0.7.1.2/www/cgi-bin/webif/adv_pf.sh
--- 0.7.1.1/www/cgi-bin/webif/adv_pf.sh	2006-11-23 01:45:46.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/adv_pf.sh	2006-12-21 22:20:29.000000000 +0900
@@ -4,7 +4,7 @@
 . /usr/lib/webif/advanced.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -24,8 +24,7 @@
 if [ "$FORM_submit" != "" ]
 then
 	validate <<EOF
-user|FORM_srule|@TR<<Select>>|required|$FORM_srule
-string|FORM_srule|@TR<<Select Rule>>|required|$FORM_srule
+add_remove|FORM_srule|@TR<<Select>>|required|$FORM_srule
 EOF
 	if [ "$?" != "0" ]
 	then
@@ -34,14 +33,12 @@
 		if [ "$FORM_srule" == "add" ]
 		then
 			validate <<EOF
-user|FORM_origp|@TR<<Public Port>>|required|$FORM_origp
 port|FORM_origp|@TR<<Public Port>>|required|$FORM_origp
 port|FORM_origpr|@TR<<Public Port Range>>||$FORM_origpr
-user|FORM_destip|@TR<<Destination IP>>|required|$FORM_destip
 ip|FORM_destip|@TR<<Destination IP>>|required|$FORM_destip
-user|FORM_destp|@TR<<Private Port>>|required|$FORM_destp
 port|FORM_destp|@TR<<Private Port>>|required|$FORM_destp
 port|FORM_destpr|@TR<<Private Port Range>>||$FORM_destpr
+tcp_udp|FORM_sproto|@TR<<Protocol>>||$FORM_sproto
 EOF
 			if [ "$?" != "0" ]
 			then
@@ -102,8 +99,7 @@
 			fi
     	 	else
 			validate <<EOF
-user|FORM_sruledel|@TR<<Select Rule>>|required|$FORM_sruledel
-int|FORM_sruledel|@TR<<Select Rule>>||$FORM_sruledel
+int|FORM_sruledel|@TR<<Select Rule>>|min=0|$FORM_sruledel
 EOF
 			if [ "$?" != "0" ]
 			then
@@ -258,7 +254,7 @@
 	    	add_label_cell|@TR<<Select>>
 	    	start_select_cell|srule|$FORM_srule|tableTextSelect
 			    option|add|@TR<<Add>>
-			    option|rem|@TR<<Remove>>
+			    option|remove|@TR<<Remove>>
 		end_select_cell
 	    end_row
     end_table
@@ -294,7 +290,7 @@
 	start_table|0|10|5
 		add_row
 	        	onchange|onchange
-			add_label_cell|Protocol
+			add_label_cell|@TR<<Protocol>>
 			start_select_cell|sproto|$FORM_sproto|tableTextSelect
 		        	option|both|@TR<<Both>>
 		        	option|tcp|TCP

diff -r -u 0.7.1.1/www/cgi-bin/webif/adv_wifi.sh 0.7.1.2/www/cgi-bin/webif/adv_wifi.sh
--- 0.7.1.1/www/cgi-bin/webif/adv_wifi.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/adv_wifi.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -20,9 +20,8 @@
 	get_default channel advanced channel
 else
 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
+chk_bgmode|FORM_bgmode|@TR<<BGMode#b/g Mode>>|required|$FORM_bgmode
+chk_channel|FORM_channel|@TR<<Channel>>|required|$FORM_channel
 EOF
 	equal "$?" 0 && {
 	if [ "$FORM_bgmode" == "b" ]

diff -r -u 0.7.1.1/www/cgi-bin/webif/connection.sh 0.7.1.2/www/cgi-bin/webif/connection.sh
--- 0.7.1.1/www/cgi-bin/webif/connection.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/connection.sh	2006-12-22 20:47:40.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -22,12 +22,11 @@
 	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)
+	validate <<EOF
+conn_type|FORM_mode|@TR<<Mode>>||$FORM_mode
+EOF
+
+equal "$?" 0 && {
 	case "$FORM_mode" in
 		static)
 			V_S="required"
@@ -42,17 +41,15 @@
 	esac
 
 	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
 ip|FORM_gateway|@TR<<Default Gateway>>|$V_S|$FORM_gateway
 ip|FORM_pptp_server|@TR<<PPTP Server IP>>|$V_PPTP|$FORM_pptp_server
-string|FORM_username|@TR<<Username>>|$V_PPP|$FORM_username
-user|FORM_username|@TR<<Username>>||$FORM_username
-string|FORM_password|@TR<<Password>>|$V_PPP|$FORM_password
-user|FORM_password|@TR<<Password>>||$FORM_password
+string|FORM_username|@TR<<Username>>|$V_PPP max=32|$FORM_username
+string|FORM_password|@TR<<Password>>|$V_PPP max=32|$FORM_password
 EOF
+
 	equal "$?" 0 && {
 		save_setting fon wan mode "$FORM_mode"
 		case "$FORM_mode" in
@@ -79,6 +76,7 @@
 		lock -u /var/run/network-connection
 		SAVED=1
 	}
+}
 fi
 
 sel_conn=1

diff -r -u 0.7.1.1/www/cgi-bin/webif/language.sh 0.7.1.2/www/cgi-bin/webif/language.sh
--- 0.7.1.1/www/cgi-bin/webif/language.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/language.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -13,7 +13,7 @@
 
 FORM_lang=`cat /etc/config/webif | grep lang | cut -d" " -f3`
 
-
+languages="$(ls /usr/lib/webif/lang | awk '{ if (lang != "") lang = lang "|"; lang = lang $1; }; END { print lang } ')"
 
 rm -rf /tmp/languages.dat 2> /dev/null
 

diff -r -u 0.7.1.1/www/cgi-bin/webif/password.sh 0.7.1.2/www/cgi-bin/webif/password.sh
--- 0.7.1.1/www/cgi-bin/webif/password.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/password.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -14,8 +14,8 @@
 empty "$FORM_submit" || {
 
 validate <<EOF
-string|FORM_pw1|Password|required min=5|$FORM_pw1
-string|FORM_pw2|Password|required min=5|$FORM_pw2
+string|FORM_pw1|Password|required min=5 max=16|$FORM_pw1
+string|FORM_pw2|Password|required min=5 max=16|$FORM_pw2
 EOF
 	equal "$?" 0 && {
 		equal "$FORM_pw1" "$FORM_pw2" || {

diff -r -u 0.7.1.1/www/cgi-bin/webif/private.sh 0.7.1.2/www/cgi-bin/webif/private.sh
--- 0.7.1.1/www/cgi-bin/webif/private.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/private.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -36,6 +36,14 @@
 	get_default key3 private key3
 	get_default key4 private key4
 else
+	validate <<EOF
+string|FORM_ssid|@TR<<ESSID>>|required max=28|$FORM_ssid
+chk_auth|FORM_auth|@TR<<Authentication>>||$FORM_auth
+int|FORM_wepkey|@TR<<Selected WEP Key>>|min=1 max=4|$FORM_wepkey
+chk_crypto|FORM_crypto|@TR<<Cipher>>||$FORM_crypto
+EOF
+
+equal "$?" 0 && {
 	case "$FORM_auth" in
 		wpa|wpa2|mixed) V_PSK="required";;
 		wep)
@@ -44,20 +52,11 @@
 	esac
 
 	validate <<EOF
-string|FORM_ssid|@TR<<ESSID>>|required max=28|$FORM_ssid
-user|FORM_ssid|@TR<<ESSID>>||$FORM_ssid
 string|FORM_psk|@TR<<WPA Passphrase>>|min=8 max=63 $V_PSK|$FORM_psk
-user|FORM_psk|@TR<<WPA Passphrase>>||$FORM_psk
-int|FORM_wepkey|@TR<<Selected WEP Key>>|min=1 max=4|$FORM_wepkey
 wep|FORM_key1|@TR<<WEP Key>> 1|$V_K1|$FORM_key1
-user|FORM_key1|@TR<<WEP Key>> 1||$FORM_key1
 wep|FORM_key2|@TR<<WEP Key>> 2|$V_K2|$FORM_key2
-user|FORM_key2|@TR<<WEP Key>> 2||$FORM_key2
 wep|FORM_key3|@TR<<WEP Key>> 3|$V_K3|$FORM_key3
-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"
@@ -83,6 +82,7 @@
 		ifup lan >/dev/null 2>/dev/null </dev/null &
 		SAVED=1
 	}
+}
 fi
 
 header "Priv_Title#Private Wireless Settings"

diff -r -u 0.7.1.1/www/cgi-bin/webif/public.sh 0.7.1.2/www/cgi-bin/webif/public.sh
--- 0.7.1.1/www/cgi-bin/webif/public.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/public.sh	2006-12-21 22:20:29.000000000 +0900
@@ -3,7 +3,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]
@@ -18,7 +18,6 @@
 else
 	validate <<EOF
 string|FORM_ssid|@TR<<ESSID>>|required max=28|$FORM_ssid
-user|FORM_ssid|@TR<<ESSID>>||$FORM_ssid
 EOF
 	equal "$?" 0 && {
 		save_setting fon public essid "$FORM_ssid"

diff -r -u 0.7.1.1/www/cgi-bin/webif/upgrade.sh 0.7.1.2/www/cgi-bin/webif/upgrade.sh
--- 0.7.1.1/www/cgi-bin/webif/upgrade.sh	2006-11-23 20:54:21.000000000 +0900
+++ 0.7.1.2/www/cgi-bin/webif/upgrade.sh	2006-12-21 22:20:29.000000000 +0900
@@ -2,7 +2,7 @@
 . /usr/lib/webif/webif.sh
 
 validate <<EOF
-user|FORM_submit|@TR<<Submit>>||$FORM_submit
+string|FORM_submit|@TR<<Submit>>|max=10|$FORM_submit
 EOF
 
 if [ "$?" != "0" ]