X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-app-travelmate%2Fluasrc%2Fmodel%2Fcbi%2Ftravelmate%2Fwifi_add.lua;h=991e75a7e47c1938c02e4db2d3ad441e8bdda4e7;hb=ee46a6c7121c2252a8c57f11d9e7719d2fbba342;hp=1e8bd7ec6864634b5e928595a3a02e84f004faeb;hpb=7749af89d89058f1bae1badf0a2c9af6ed2badaf;p=project%2Fluci.git

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index 1e8bd7ec6..991e75a7e 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -4,7 +4,7 @@
 local fs       = require("nixio.fs")
 local uci      = require("luci.model.uci").cursor()
 local http     = require("luci.http")
-local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
+local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
 local encr_psk = {"psk", "psk2", "psk-mixed"}
 local encr_wpa = {"wpa", "wpa2", "wpa-mixed"}
 
@@ -26,16 +26,20 @@ m.hidden = {
 	wpa_version = http.formvalue("wpa_version")
 }
 
-if m.hidden.ssid ~= "" then
+if m.hidden.ssid == "" then
+	wssid = m:field(Value, "ssid", translate("SSID (hidden)"))
+else
 	wssid = m:field(Value, "ssid", translate("SSID"))
 	wssid.datatype = "rangelength(1,32)"
 	wssid.default = m.hidden.ssid or ""
-else
-	wssid = m:field(Value, "ssid", translate("SSID (hidden)"))
 end
 
 nobssid = m:field(Flag, "no_bssid", translate("Ignore BSSID"))
-nobssid.default = nobssid.enabled
+if m.hidden.ssid == "" then
+	nobssid.default = nobssid.disabled
+else
+	nobssid.default = nobssid.enabled
+end
 
 bssid = m:field(Value, "bssid", translate("BSSID"))
 bssid:depends("no_bssid", 0)
@@ -101,6 +105,8 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
 		authentication:value("EAP-MD5")
 		authentication:value("EAP-MSCHAPV2")
 		authentication:value("EAP-TLS")
+		authentication:value("auth=PAP")
+		authentication:value("auth=MSCHAPV2")
 		authentication.default = "EAP-MSCHAPV2"
 
 		ident = m:field(Value, "identity", translate("Identity"))
@@ -169,6 +175,7 @@ function wssid.write(self, section, value)
 	end
 	uci:save("wireless")
 	uci:commit("wireless")
+	luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
 	http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
 end