Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-{mini,full}: fixup wpa-mixed dependencies, make key a password field, fix bssid dependency for broadcom ad-hoc mode in admin-mini

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-05-29 19:54:18 +00:00
parent 53e5655810
commit 601deffafc
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -369,10 +369,13 @@ port.rmempty = true
key = s:option(Value, "key", translate("key")) key = s:option(Value, "key", translate("key"))
key:depends("encryption", "wep") key:depends("encryption", "wep")
key:depends("encryption", "psk") 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:depends({mode="ap", encryption="wpa2"})
key.rmempty = true key.rmempty = true
key.password = true
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
nasid = s:option(Value, "nasid", translate("a_w_nasid")) nasid = s:option(Value, "nasid", translate("a_w_nasid"))

6
modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
View file

@ -253,10 +253,13 @@ end
key = s:option(Value, "key", translate("key")) key = s:option(Value, "key", translate("key"))
key:depends("encryption", "wep") key:depends("encryption", "wep")
key:depends("encryption", "psk") 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:depends({mode="ap", encryption="wpa2"})
key.rmempty = true key.rmempty = true
key.password = true
server = s:option(Value, "server", translate("a_w_radiussrv")) server = s:option(Value, "server", translate("a_w_radiussrv"))
server:depends({mode="ap", encryption="wpa"}) server:depends({mode="ap", encryption="wpa"})
@ -336,6 +339,7 @@ end
if hwtype == "broadcom" then if hwtype == "broadcom" then
bssid:depends({mode="wds"}) bssid:depends({mode="wds"})
bssid:depends({mode="adhoc"})
end end