Changeset 7156

Timestamp:

06/16/11 00:15:38 (2 years ago)

Author:

jow

Message:

luci-0.10: merge r7155

Files:

• luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua (modified) (5 diffs)

luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

@@ -560 +560 @@
         encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
         encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
-        encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"})
+        encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
     elseif hostapd and not supplicant then
         encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"})
@@ -692 +692 @@
     eaptype:depends({mode="sta", encryption="wpa"})
     eaptype:depends({mode="sta", encryption="wpa2"})
+    eaptype:depends({mode="sta-wds", encryption="wpa"})
+    eaptype:depends({mode="sta-wds", encryption="wpa2"})
 
     cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate"))
     cacert:depends({mode="sta", encryption="wpa"})
     cacert:depends({mode="sta", encryption="wpa2"})
+    cacert:depends({mode="sta-wds", encryption="wpa"})
+    cacert:depends({mode="sta-wds", encryption="wpa2"})
 
     privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key"))
     privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"})
     privkey:depends({mode="sta", eap_type="tls", encryption="wpa"})
+    privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
+    privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
 
     privkeypwd = s:taboption("encryption", Value, "priv_key_pwd", translate("Password of Private Key"))
     privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa2"})
     privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa"})
+    privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
+    privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
 
 
@@ -715 +723 @@
     auth:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
     auth:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+    auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+    auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+    auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+    auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
 
 
@@ -722 +734 @@
     identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
     identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+    identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+    identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+    identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+    identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
 
     password = s:taboption("encryption", Value, "password", translate("Password"))
@@ -728 +744 @@
     password:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
     password:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+    password:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+    password:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+    password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+    password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
 end