diff options
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 58 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/wifi.lua | 10 |
2 files changed, 34 insertions, 34 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 e49b158930..bd4bd09e88 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -234,12 +234,12 @@ end encr = s:option(ListValue, "encryption", translate("encryption")) encr:value("none", "keine") encr:value("wep", "WEP") -encr:value("PSK", "WPA-PSK") -encr:value("PSK2", "WPA2-PSK") +encr:value("psk", "WPA-PSK") +encr:value("psk2", "WPA2-PSK") if hwtype == "atheros" or hwtype == "mac80211" then - encr:value("WPA", "WPA-EAP", {mode="ap"}, {mode="sta"}) - encr:value("WPA2", "WPA2-EAP", {mode="ap"}, {mode="sta"}) + encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}) + encr:value("wpa2i", "WPA2-EAP", {mode="ap"}, {mode="sta"}) end encr:depends("mode", "ap") @@ -247,60 +247,60 @@ encr:depends("mode", "sta") encr:depends("mode", "wds") server = s:option(Value, "server", translate("a_w_radiussrv")) -server:depends({mode="ap", encryption="WPA"}) -server:depends({mode="ap", encryption="WPA2"}) +server:depends({mode="ap", encryption="wpa"}) +server:depends({mode="ap", encryption="wpa2i"}) server.rmempty = true port = s:option(Value, "port", translate("a_w_radiusport")) -port:depends({mode="ap", encryption="WPA"}) -port:depends({mode="ap", encryption="WPA2"}) +port:depends({mode="ap", encryption="wpa"}) +port:depends({mode="ap", encryption="wpa2i"}) 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({mode="ap", encryption="WPA2"}) +key:depends("encryption", "psk") +key:depends({mode="ap", encryption="wpa"}) +key:depends("encryption", "psk2") +key:depends({mode="ap", encryption="wpa2i"}) key.rmempty = true if hwtype == "atheros" or hwtype == "mac80211" then nasid = s:option(Value, "nasid", translate("a_w_nasid")) - nasid:depends({mode="ap", encryption="WPA"}) - nasid:depends({mode="ap", encryption="WPA2"}) + nasid:depends({mode="ap", encryption="wpa"}) + nasid:depends({mode="ap", encryption="wpa2i"}) nasid.rmempty = true eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) eaptype:value("TLS") eaptype:value("PEAP") - eaptype:depends({mode="sta", encryption="WPA"}) - eaptype:depends({mode="sta", encryption="WPA2"}) + eaptype:depends({mode="sta", encryption="wpa"}) + eaptype:depends({mode="sta", encryption="wpa2i"}) cacert = s:option(Value, "ca_cert", translate("a_w_cacert")) - cacert:depends({mode="sta", encryption="WPA"}) - cacert:depends({mode="sta", encryption="WPA2"}) + cacert:depends({mode="sta", encryption="wpa"}) + cacert:depends({mode="sta", encryption="wpa2i"}) privkey = s:option(Value, "priv_key", translate("a_w_tlsprivkey")) - privkey:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) - privkey:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2i"}) + privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"}) privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA2"}) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="WPA"}) + privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2i"}) + privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"}) auth = s:option(Value, "auth", translate("a_w_peapauth")) - auth:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) - auth:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) identity = s:option(Value, "identity", translate("a_w_peapidentity")) - identity:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) - identity:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) password = s:option(Value, "password", translate("a_w_peappassword")) - password:depends({mode="sta", eap_type="PEAP", encryption="WPA2"}) - password:depends({mode="sta", eap_type="PEAP", encryption="WPA"}) + password:depends({mode="sta", eap_type="PEAP", encryption="wpa2i"}) + password:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) end -return m
\ No newline at end of file +return m diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua index 5f2e014f3c..e413211214 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -211,24 +211,24 @@ encr:value("wep", "WEP") encr:value("psk", "WPA-PSK") encr:value("wpa", "WPA-Radius", {mode="ap"}) encr:value("psk2", "WPA2-PSK") -encr:value("wpa2", "WPA2-Radius", {mode="ap"}) +encr:value("wpa2i", "WPA2-Radius", {mode="ap"}) key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") key:depends("encryption", "wpa") key:depends("encryption", "psk2") -key:depends("encryption", "wpa2") +key:depends("encryption", "wpa2i") key.rmempty = true server = s:option(Value, "server", translate("a_w_radiussrv")) server:depends("encryption", "wpa") -server:depends("encryption", "wpa2") +server:depends("encryption", "wpa2i") server.rmempty = true port = s:option(Value, "port", translate("a_w_radiusport")) port:depends("encryption", "wpa") -port:depends("encryption", "wpa2") +port:depends("encryption", "wpa2i") port.rmempty = true @@ -251,4 +251,4 @@ if hwtype == "broadcom" then end -return m
\ No newline at end of file +return m |