mini/wifi: Make WPA(2)-Radius only avaiable in Master-Mode, Remove double XML-escape...

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 64e7400ca013e55b1fc7cd6da6775441f97c82d0..7aff62323444a4ffb4c9c661165fbfbcbe4c9374 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -93,7 +93,7 @@ t2.render = function() end
 t2:option(DummyValue, "Quality", translate("iwscan_link"))
 essid = t2:option(DummyValue, "ESSID", "ESSID")
 function essid.cfgvalue(self, section)
-       return luci.util.pcdata(self.map:get(section, "ESSID"))
+       return self.map:get(section, "ESSID")
 end
 
 t2:option(DummyValue, "Address", "BSSID")
@@ -190,9 +190,9 @@ encr = s:option(ListValue, "encryption", translate("encryption"))
 encr:value("none", "keine")
 encr:value("wep", "WEP")
 encr:value("psk", "WPA-PSK")
-encr:value("wpa", "WPA-Radius")
+encr:value("wpa", "WPA-Radius", {mode="ap"})
 encr:value("psk2", "WPA2-PSK")
-encr:value("wpa2", "WPA2-Radius")
+encr:value("wpa2", "WPA2-Radius", {mode="ap"})
 
 key = s:option(Value, "key", translate("key"))
 key:depends("encryption", "wep")