Merge pull request #1476 from dibdot/travelmate

luci-app-travelmate: sync with travelmate 1.0.0

4 files changed, 45 insertions, 30 deletions

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index 2c8dfa274..e715a2ba0 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -1,15 +1,17 @@
 -- 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 json       = require("luci.jsonc")
-local nw         = require("luci.model.network").init()
-local fw         = require("luci.model.firewall").init()
+local fs       = require("nixio.fs")
+local uci      = require("luci.model.uci").cursor()
+local json     = require("luci.jsonc")
+local util     = require("luci.util")
+local nw       = require("luci.model.network").init()
+local fw       = require("luci.model.firewall").init()
+local dump     = util.ubus("network.interface", "dump", {})
 local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
-local trminput   = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json"
-local uplink     = uci.get("network", trmiface) or ""
-local parse      = json.parse(fs.readfile(trminput) or "")
+local trminput = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json"
+local uplink   = uci.get("network", trmiface) or ""
+local parse    = json.parse(fs.readfile(trminput) or "")
 
 m = Map("travelmate", translate("Travelmate"),
 	translate("Configuration of the travelmate package to to enable travel router functionality. ")
@@ -38,7 +40,8 @@ if uplink == "" then
 	btn.inputtitle = translate("Add Interface")
 	btn.inputstyle = "apply"
 	btn.disabled = false
-	function btn.write(self, section, value)
+
+	function btn.write(self, section)
 		local iface = o:formvalue(section)
 		if iface then
 			uci:set("travelmate", section, "trm_iface", iface)
@@ -75,19 +78,16 @@ o2 = s:option(Flag, "trm_automatic", translate("Enable 'automatic' mode"),
 o2.default = o2.enabled
 o2.rmempty = false
 
-btn = s:option(Button, "", translate("Manual Rescan"))
-btn:depends("trm_automatic", "")
-btn.inputtitle = translate("Rescan")
-btn.inputstyle = "find"
-btn.disabled = false
-function btn.write()
-	luci.sys.call("env -i /etc/init.d/travelmate start >/dev/null 2>&1")
-	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+o3 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
+	translate("Name of the used uplink interface."))
+if dump then
+	local i, v
+	for i, v in ipairs(dump.interface) do
+		if v.interface ~= "loopback" and v.interface ~= "lan" then
+			o3:value(v.interface)
+		end
+	end
 end
-
-o3 = s:option(Value, "trm_iface", translate("Uplink / Trigger interface"),
-	translate("Name of the uplink interface that triggers travelmate processing in 'manual' mode."))
-o3.datatype = "and(uciname,rangelength(3,15))"
 o3.default = trmiface
 o3.rmempty = false
 
@@ -97,6 +97,18 @@ o4.default = 2
 o4.datatype = "range(1,90)"
 o4.rmempty = false
 
+btn = s:option(Button, "", translate("Manual Rescan"),
+	translate("Force a manual uplink rescan / reconnect in 'trigger' mode."))
+btn:depends("trm_automatic", "")
+btn.inputtitle = translate("Rescan")
+btn.inputstyle = "find"
+btn.disabled = false
+
+function btn.write()
+	luci.sys.call("env -i /etc/init.d/travelmate start >/dev/null 2>&1")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+end
+
 -- Runtime information
 
 ds = m:section(NamedSection, "global", "travelmate", translate("Runtime Information"))
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 31869478f..a3dd0a2b9 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
@@ -5,6 +5,8 @@ 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 encr_psk = {"psk", "psk2", "psk-mixed"}
+local encr_wpa = {"wpa", "wpa2", "wpa-mixed"}
 
 m = SimpleForm("add", translate("Add Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -53,7 +55,7 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
 		encr:value("psk", "WPA PSK")
 		encr:value("psk-mixed", "WPA/WPA2 mixed")
 		encr:value("psk2", "WPA2 PSK")
-		encr.default = "psk2"
+		encr.default = encr_psk[tonumber(m.hidden.wpa_version)] or "psk2"
 
 		ciph = m:field(ListValue, "cipher", translate("Cipher"))
 		ciph:value("auto", translate("Automatic"))
@@ -70,7 +72,7 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
 		encr:value("wpa", "WPA Enterprise")
 		encr:value("wpa-mixed", "WPA/WPA2 Enterprise mixed")
 		encr:value("wpa2", "WPA2 Enterprise")
-		encr.default = "wpa2"
+		encr.default = encr_wpa[tonumber(m.hidden.wpa_version)] or "wpa2"
 
 		ciph = m:field(ListValue, "cipher", translate("Cipher"))
 		ciph:value("auto", translate("Automatic"))
@@ -131,7 +133,7 @@ function wssid.write(self, section, value)
 		bssid    = bssid:formvalue(section),
 		disabled = "1"
 	})
-	
+
 	if (tonumber(m.hidden.wep) or 0) == 1 then
 		uci:set("wireless", newsection, "encryption", encr:formvalue(section))
 		uci:set("wireless", newsection, "key", wkey:formvalue(section) or "")
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 64659d65e..b8e0f11b3 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
@@ -22,17 +22,17 @@ local s = uci:get_all("wireless", m.hidden.cfg)
 if s ~= nil then
 	wssid = m:field(Value, "ssid", translate("SSID"))
 	wssid.datatype = "rangelength(1,32)"
-	wssid.default = s.ssid
+	wssid.default = s.ssid or ""
+
 	bssid = m:field(Value, "bssid", translate("BSSID"))
 	bssid.datatype = "macaddr"
-	bssid.default = s.bssid
+	bssid.default = s.bssid or ""
 
+	s.cipher = "auto"
 	if string.match(s.encryption, '\+') and not string.match(s.encryption, '^wep') then
 		s.pos = string.find(s.encryption, '\+')
 		s.cipher = string.sub(s.encryption, s.pos + 1)
 		s.encryption = string.sub(s.encryption, 0, s.pos - 1)
-	else
-		s.cipher = "auto"
 	end
 
 	if s.encryption and s.encryption ~= "none" then
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index aea194cde..a8f63a17e 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -7,7 +7,8 @@ This is free software, licensed under the Apache License, Version 2.0
     local sys = require("luci.sys")
     local utl = require("luci.util")
     local dev = luci.http.formvalue("device")
-    local iw = luci.sys.wifi.getiwinfo(dev)
+    local iw  = luci.sys.wifi.getiwinfo(dev)
+    local wpa_label = {translate("WPA"), translate("WPA2"), translate("WPA/WPA2")}
 
     if not iw then
         luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
@@ -17,7 +18,7 @@ This is free software, licensed under the Apache License, Version 2.0
         if info.wep == true then
             return translate("WEP")
         elseif info.wpa > 0 then
-            return translatef("%s (%s/%s)", (info.wpa == 3) and translate("WPA/WPA2") or (info.wpa == 2 and "WPA2" or "WPA"), table.concat(info.auth_suites), table.concat(info.group_ciphers))
+            return "%s (%s/%s)" %{wpa_label[info.wpa], table.concat(info.auth_suites), table.concat(info.group_ciphers)}
         elseif info.enabled then
             return translate("Unknown")
         else