summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-travelmate
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2018-04-04 14:19:23 +0200
committerDirk Brenken <dev@brenken.org>2018-04-04 14:19:23 +0200
commitee46a6c7121c2252a8c57f11d9e7719d2fbba342 (patch)
tree16b6ecaddd7e5a6013040ad4809821ada7ace6cf /applications/luci-app-travelmate
parent189fe1e389fe379528272443f25eb9b2ce7cf4d5 (diff)
luci-app-travelmate: sync with travelmate 1.2.0
* remove needless 'automatic' and 'trigger' options plus small fixes Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications/luci-app-travelmate')
-rw-r--r--applications/luci-app-travelmate/luasrc/controller/travelmate.lua4
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua41
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua1
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua1
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua1
5 files changed, 17 insertions, 31 deletions
diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
index d99c4cbefd..b2b877347c 100644
--- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
+++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
@@ -30,11 +30,11 @@ function index()
end
function logread()
- local logfile
+ local logfile = ""
if nixio.fs.access("/var/log/messages") then
logfile = util.trim(util.exec("grep -F 'travelmate-' /var/log/messages"))
- else
+ elseif nixio.fs.access("/sbin/logread") then
logfile = util.trim(util.exec("logread -e 'travelmate-'"))
end
templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile})
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 d17845f520..7b6b9658ca 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
@@ -73,53 +73,36 @@ o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate"))
o1.default = o1.disabled
o1.rmempty = false
-o2 = s:option(Flag, "trm_automatic", translate("Enable 'automatic' mode"),
- translate("Keep travelmate in an active state. Check every n seconds the connection status, i.e. the uplink availability."))
+o2 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"),
+ translate("Check the internet availability, log captive portal redirections and keep the uplink connection 'alive'."))
o2.default = o2.enabled
o2.rmempty = false
-o3 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"),
- translate("Check the internet availability, log captive portal redirections and keep the uplink connection 'alive'."))
-o3.default = o3.enabled
-o3.rmempty = false
-
-o4 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
+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
- o4:value(v.interface)
+ o3:value(v.interface)
end
end
end
-o4.default = trmiface
-o4.rmempty = false
+o3.default = trmiface
+o3.rmempty = false
if fs.access("/usr/bin/qrencode") then
- btn1 = s:option(Button, "btn1", translate("View AP QR-Codes"),
+ btn = s:option(Button, "btn", translate("View AP QR-Codes"),
translate("Connect your Android or iOS devices to your router's WiFi using the shown QR code."))
- btn1.inputtitle = translate("QR-Codes")
- btn1.inputstyle = "apply"
- btn1.disabled = false
+ btn.inputtitle = translate("QR-Codes")
+ btn.inputstyle = "apply"
+ btn.disabled = false
- function btn1.write()
+ function btn.write()
luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate", "apqr"))
end
end
-btn2 = s:option(Button, "btn2", translate("Manual Rescan"),
- translate("Force a manual uplink rescan / reconnect in 'trigger' mode."))
-btn2:depends("trm_automatic", "")
-btn2.inputtitle = translate("Rescan")
-btn2.inputstyle = "find"
-btn2.disabled = false
-
-function btn2.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"))
@@ -211,7 +194,7 @@ e6.datatype = "range(20,40)"
e6.rmempty = false
e7 = e:option(Value, "trm_timeout", translate("Overall Timeout"),
- translate("Timeout in seconds between retries in 'automatic' mode."))
+ translate("Overall retry timeout in seconds."))
e7.default = 60
e7.datatype = "range(30,300)"
e7.rmempty = false
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 e9e1ee40f2..991e75a7e4 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
@@ -175,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
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua
index 0c3cc1865b..0a7678f7ed 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_delete.lua
@@ -9,5 +9,6 @@ if cfg ~= nil then
uci:delete("wireless", cfg)
uci:save("wireless")
uci:commit("wireless")
+ luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
end
http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
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 ee4d342ea1..f3ad762594 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
@@ -162,6 +162,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")
m.on_cancel()
end