luci-0.9: merge r5964

diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 7ffdd091e2429d7779b4d40b2bbc1c6233b9019d..c3892145e25514fb18f0896832c8948a00c432bf 100644 (file)
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -161,16 +161,28 @@ function statistics_render()
        local span  = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
        local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ) )
 
+       -- deliver image
+       if vars.img then
+               local l12 = require "luci.ltn12"
+               local png = io.open(graph.opts.imgpath .. "/" .. vars.img:gsub("%.+", "."), "r")
+               if png then
+                       luci.http.prepare_content("image/png")
+                       l12.pump.all(l12.source.file(png), luci.http.write)
+                       png:close()
+               end
+               return
+       end
+
        local plugin, instances
        local images = { }
 
        -- find requested plugin and instance
-        for i, p in ipairs( luci.dispatcher.context.path ) do
-                if luci.dispatcher.context.path[i] == "graph" then
-                        plugin    = luci.dispatcher.context.path[i+1]
-                        instances = { luci.dispatcher.context.path[i+2] }
-                end
+    for i, p in ipairs( luci.dispatcher.context.path ) do
+        if luci.dispatcher.context.path[i] == "graph" then
+            plugin    = luci.dispatcher.context.path[i+1]
+            instances = { luci.dispatcher.context.path[i+2] }
         end
+    end
 
        -- no instance requested, find all instances
        if #instances == 0 then

diff --git a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
index bf304c7b455c7b2a402939611e5f173c5e0d323e..fa774e8416c30ece5aa164e971fe29b6b33a5efe 100644 (file)
--- a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
@@ -31,7 +31,7 @@ $Id$
 
 <div style="text-align: center">
        <% for i, img in ipairs(images) do %>
-               <img src="/rrdimg/<%=img%>" />
+               <img src="<%=REQUEST_URI%>?img=<%=img%>" />
                <br />
        <% end %>
 </div>