X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-travelmate%2Fluasrc%2Fmodel%2Fcbi%2Ftravelmate%2Fwifi_edit.lua;h=1baca5be40ebb5e87cee72e1f76778c0b5f49a60;hp=c60ff22c4de098ad636063fe6f339dc2be6a7910;hb=2474cdd049c7e9523cc5055a97a86229943a2f3a;hpb=83e47322fce5e945496e1cdd0631164e7ff36748

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index c60ff22c4..1baca5be4 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -1,9 +1,10 @@
 -- Copyright 2017 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
+local fs   = require("nixio.fs")
+local uci  = require("luci.model.uci").cursor()
 local http = require("luci.http")
+local val  = ""
 
 m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -21,8 +22,15 @@ m.hidden = {
 local s = uci:get_all("wireless", m.hidden.cfg)
 if s ~= nil then
 	wssid = m:field(Value, "ssid", translate("SSID"))
-	wssid.default = s.ssid
 	wssid.datatype = "rangelength(1,32)"
+	wssid.default = s.ssid
+	bssid = m:field(Value, "bssid", translate("BSSID"))
+	bssid.datatype = "macaddr"
+	bssid.default = s.bssid
+	if s.identity then
+		ident = m:field(Value, "identity", translate("Identity"))
+		ident.default = s.identity
+	end
 	if s.encryption and s.key then
 		wkey = m:field(Value, "key", translatef("Passphrase (%s)", s.encryption))
 	elseif s.encryption and s.password then
@@ -43,10 +51,25 @@ end
 
 function wssid.write(self, section, value)
 	uci:set("wireless", m.hidden.cfg, "ssid", wssid:formvalue(section))
-	if s.encryption and s.key then
-		uci:set("wireless", m.hidden.cfg, "key", wkey:formvalue(section))
-	elseif s.encryption and s.password then
-		uci:set("wireless", m.hidden.cfg, "password", wkey:formvalue(section))
+	uci:set("wireless", m.hidden.cfg, "bssid", bssid:formvalue(section))
+	if s.identity then
+		val = ident:formvalue(section)
+		if val == "" then
+			val = "changeme"
+		end
+		uci:set("wireless", m.hidden.cfg, "identity", val)
+	end
+
+	if s.encryption and s.encryption ~= "none" then
+		val = wkey:formvalue(section)
+		if val == "" then
+			val = "changeme"
+		end
+		if s.key then
+			uci:set("wireless", m.hidden.cfg, "key", val)
+		elseif s.password then
+			uci:set("wireless", m.hidden.cfg, "password", val)
+		end
 	end
 	uci:save("wireless")
 	uci:commit("wireless")