Changeset 5965

Timestamp:

03/28/10 00:20:14 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5964

Location:

luci/branches/luci-0.9/applications/luci-statistics/luasrc

Files:

• controller/luci_statistics/luci_statistics.lua (modified) (1 diff)
• view/public_statistics/graph.htm (modified) (1 diff)

luci/branches/luci-0.9/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua

@@ -162 +162 @@
     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

luci/branches/luci-0.9/applications/luci-statistics/luasrc/view/public_statistics/graph.htm

@@ -32 +32 @@
 <div style="text-align: center">
     <% for i, img in ipairs(images) do %>
-        <img src="/rrdimg/<%=img%>" />
+        <img src="<%=REQUEST_URI%>?img=<%=img%>" />
         <br />
     <% end %>