From 318c7831baa43f81718878be36e6ceffc3ee9e38 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 29 May 2009 19:54:59 +0000 Subject: [PATCH] luci-0.8: merge r4708 --- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 5 ++++- modules/admin-mini/luasrc/model/cbi/mini/wifi.lua | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 e0ed68550..9227fd2bd 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -365,10 +365,13 @@ port.rmempty = true key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") -key:depends({mode="ap", encryption="wpa"}) key:depends("encryption", "psk2") +key:depends("encryption", "psk+psk2") +key:depends("encryption", "mixed") +key:depends({mode="ap", encryption="wpa"}) key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true +key.password = true if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then nasid = s:option(Value, "nasid", translate("a_w_nasid")) diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua index 4f1926b7b..22fd03fea 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -253,10 +253,13 @@ end key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") -key:depends({mode="ap", encryption="wpa"}) key:depends("encryption", "psk2") +key:depends("encryption", "psk+psk2") +key:depends("encryption", "mixed") +key:depends({mode="ap", encryption="wpa"}) key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true +key.password = true server = s:option(Value, "server", translate("a_w_radiussrv")) server:depends({mode="ap", encryption="wpa"}) @@ -336,6 +339,7 @@ end if hwtype == "broadcom" then bssid:depends({mode="wds"}) + bssid:depends({mode="adhoc"}) end -- 2.25.1