From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 29 May 2009 19:09:27 +0000 (+0000)
Subject: luci-0.8: merge missing parts of r4293
X-Git-Tag: 0.8.7~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8183a8f4de2dc40f9f3dc93b91fedafc14e96b5c;p=oweals%2Fluci.git

luci-0.8: merge missing parts of r4293
---

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index 000e3adf7..6a701e6af 100644
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -465,6 +465,8 @@ config variable
 	option name 'key'
 	option section 'wireless.wifi-iface'
 	option title 'Key'
+	option minlength 8
+	option maxlength 63
 	list depends 'encryption=wep'
 	list depends 'encryption=psk'
 	list depends 'encryption=wpa,mode=ap'
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 6a8e245d3..e0ed68550 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -322,17 +322,20 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
 	if hostapd and supplicant then
 		encr:value("psk", "WPA-PSK")
 		encr:value("psk2", "WPA2-PSK")
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
 		encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
 		encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"})
 	elseif hostapd and not supplicant then
 		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
 		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}, {mode="ahdemo"})
 		encr:value("wpa", "WPA-EAP", {mode="ap"})
 		encr:value("wpa2", "WPA2-EAP", {mode="ap"})
 		encr.description = translate("wifi_wpareq")
 	elseif not hostapd and supplicant then
 		encr:value("psk", "WPA-PSK", {mode="sta"})
 		encr:value("psk2", "WPA2-PSK", {mode="sta"})
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
 		encr:value("wpa", "WPA-EAP", {mode="sta"})
 		encr:value("wpa2", "WPA2-EAP", {mode="sta"})
 		encr.description = translate("wifi_wpareq")
@@ -342,6 +345,7 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
 elseif hwtype == "broadcom" then
 	encr:value("psk", "WPA-PSK")
 	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
 encr:depends("mode", "ap")
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 6cf087432..4f1926b7b 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -230,6 +230,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 	elseif hostapd and not supplicant then
 		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
 		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
 		encr:value("wpa", "WPA-Radius", {mode="ap"})
 		encr:value("wpa2", "WPA2-Radius", {mode="ap"})
 		encr.description = translate("wifi_wpareq")
@@ -246,6 +247,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 elseif hwtype == "broadcom" then
 	encr:value("psk", "WPA-PSK")
 	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
 key = s:option(Value, "key", translate("key"))