modules/admin-{mini,full}: fixup wpa-mixed dependencies, make key a password field...

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 fe28995..a08adc5 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -369,10 +369,13 @@ port.rmempty = true
 key = s:option(Value, "key", translate("key"))
 key:depends("encryption", "wep")
 key:depends("encryption", "psk")
 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", "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: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"))
 
 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 056b5ee..7d05fb0 100644 (file)
--- 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 = 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", "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: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"})
 
 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"})
 
 if hwtype == "broadcom" then
        bssid:depends({mode="wds"})

+       bssid:depends({mode="adhoc"})

 end
 
 
 end