Merge pull request #1468 from dibdot/travelmate

luci-app-travelmate: sync with travelmate 0.9.6

diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
index a418a8e..efbe619 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
+++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
@@ -3,9 +3,9 @@
 
 module("luci.controller.travelmate", package.seeall)
 
-local fs = require("nixio.fs")
-local util = require("luci.util")
-local i18n = require("luci.i18n")
+local fs    = require("nixio.fs")
+local util  = require("luci.util")
+local i18n  = require("luci.i18n")
 local templ = require("luci.template")
 
 function index()
@@ -30,6 +30,12 @@ function index()
 end
 
 function logread()
-       local logfile = util.trim(util.exec("logread -e 'travelmate'"))
+       local logfile
+
+       if nixio.fs.access("/var/log/messages") then
+               logfile = util.trim(util.exec("cat /var/log/messages | grep 'travelmate'"))
+       else
+               logfile = util.trim(util.exec("logread -e 'travelmate'"))
+       end
        templ.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile})
 end

diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index 402b1c1..11c36d4 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -4,8 +4,8 @@ This is free software, licensed under the Apache License, Version 2.0
 -%>
 
 <%-
-  local write = io.write
-  local uci = require("luci.model.uci").cursor()
+  local write    = io.write
+  local uci      = require("luci.model.uci").cursor()
   local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
 -%>
 
@@ -31,10 +31,10 @@ This is free software, licensed under the Apache License, Version 2.0
     local iface = s.network or ""
     if iface == trmiface then
       local section = s['.name'] or ""
-      local device = s.device or ""
-      local ssid = s.ssid or ""
-      local bssid = s.bssid or ""
-      local encryption = s.encryption or ""
+      local device = s.device or "-"
+      local ssid = s.ssid or "-"
+      local bssid = s.bssid or "-"
+      local encryption = s.encryption or "-"
       local disabled = s.disabled or ""
       local style = "color:#000000"
       if disabled == "0" then