wds = s:option(Flag, "wds", translate("a_w_wds"))
wds:depends({mode="ap"})
wds:depends({mode="sta"})
+ wds.rmempty = true
wdssep = s:option(Flag, "wdssep", translate("wifi_wdssep"))
wdssep:depends({mode="ap", wds="1"})
wdssep.optional = true
------------------- WiFI-Encryption -------------------
encr = s:option(ListValue, "encryption", translate("encryption"))
-encr:value("none", "keine")
+encr:depends({mode="ap"})
+encr:depends({mode="sta"})
+encr:depends({mode="adhoc"})
+encr:depends({mode="ahdemo"})
+encr:depends({mode="wds"})
+
+encr:value("none", "No Encryption")
encr:value("wep", "WEP")
-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"})
+ local supplicant = luci.fs.mtime("/usr/sbin/wpa_supplicant")
+ local hostapd = luci.fs.mtime("/usr/sbin/hostapd")
+
+ if hostapd and supplicant then
+ encr:value("psk", "WPA-PSK")
+ encr:value("psk2", "WPA2-PSK")
+ encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"})
+ encr:value("wpa2i", "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("wpa", "WPA-EAP", {mode="ap"})
+ encr:value("wpa2i", "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("wpa", "WPA-EAP", {mode="sta"})
+ encr:value("wpa2i", "WPA2-EAP", {mode="sta"})
+ encr.description = translate("wifi_wpareq")
+ else
+ encr.description = translate("wifi_wpareq")
+ end
+elseif hwtype == "broadcom" then
+ encr:value("psk", "WPA-PSK")
+ encr:value("psk2", "WPA2-PSK")
end
encr:depends("mode", "ap")
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