summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-25 23:19:00 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-25 23:19:00 +0000
commit6c7535292be50625ce01d10d2c7e2512e605cf9f (patch)
tree197eb8b18fbf022ab8d746e39f3303da3bd4412b
parentf6b77ef7f09fcce65f716abe683c27a9c0a11160 (diff)
applications/luci-vnstat: minor tweaks
-rw-r--r--applications/luci-vnstat/luasrc/view/vnstat.htm15
1 files changed, 13 insertions, 2 deletions
diff --git a/applications/luci-vnstat/luasrc/view/vnstat.htm b/applications/luci-vnstat/luasrc/view/vnstat.htm
index 440252caa7..91fd332237 100644
--- a/applications/luci-vnstat/luasrc/view/vnstat.htm
+++ b/applications/luci-vnstat/luasrc/view/vnstat.htm
@@ -28,9 +28,12 @@ style = (style and #style > 0) and style or "s"
-- render image
--
if iface then
+ style = style:gsub("[^%w]", "")
+ iface = iface:gsub("[^%w%.%-]", "")
+
luci.http.prepare_content("image/png")
- local png = io.popen("vnstati -i %q -%q -o -" % { iface, style })
+ local png = io.popen("vnstati -i '%s' '-%s' -o -" % { iface, style })
luci.http.write(png:read("*a"))
png:close()
@@ -79,10 +82,18 @@ dbdir = dbdir or "/var/lib/vnstat"
<br /><hr /><br />
<div style="text-align:center">
-<% for iface in fs.dir(dbdir) do if iface:sub(1,1) ~= "." then %>
+<% empty = true
+ for iface in fs.dir(dbdir) do if iface:sub(1,1) ~= "." then
+ empty = false
+%>
<img src="<%=REQUEST_URI%>?iface=<%=iface%>&amp;style=<%=param('style')%>" alt="" />
<br /><br />
<% end end %>
+
+<% if empty then %>
+<p><em><%:No database has been set up yet. Go to the VnStat configuration and enable monitoring for one or more interfaces.%></em></p>
+<% end %>
+
</div>
<%+footer%>