luci-app-statisctis: only include lua modules in rrd statistics into local scope

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/applications/luci-app-statistics/luasrc/statistics/i18n.lua b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
index 7877e61ab3063aa3b476a885c5962cf7f9844a5f..6b01958cbeb868f71da9ba32f973343d5133fac8 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/i18n.lua
@@ -3,15 +3,14 @@
 
 module("luci.statistics.i18n", package.seeall)
 
-require("luci.util")
-require("luci.i18n")
+local util = require("luci.util")
+local i18n = require("luci.i18n")
 
 
-Instance = luci.util.class()
-
+Instance = util.class()
 
 function Instance.__init__( self, graph )
-       self.i18n  = luci.i18n
+       self.i18n  = i18n
        self.graph = graph
 end
 

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
index f543e675996aecf66faae7dcfe1cd2bab3909c73..b9f48a45bdf0f48f38aeb28b02fa45e5419ff357 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua
@@ -3,30 +3,28 @@
 
 module("luci.statistics.rrdtool", package.seeall)
 
-require("luci.statistics.datatree")
-require("luci.statistics.rrdtool.colors")
-require("luci.statistics.i18n")
-require("luci.model.uci")
-require("luci.util")
-require("luci.sys")
+local tree   = require("luci.statistics.datatree")
+local colors = require("luci.statistics.rrdtool.colors")
+local i18n   = require("luci.statistics.i18n")
+local uci    = require("luci.model.uci").cursor()
+local util   = require("luci.util")
+local sys    = require("luci.sys")
+local fs     = require("nixio.fs")
 
-local fs = require "nixio.fs"
 
-
-Graph = luci.util.class()
+Graph = util.class()
 
 function Graph.__init__( self, timespan, opts )
 
        opts = opts or { }
 
-       local uci = luci.model.uci.cursor()
        local sections = uci:get_all( "luci_statistics" )
 
        -- options
        opts.timespan  = timespan       or sections.rrdtool.default_timespan or 900
        opts.rrasingle = opts.rrasingle or ( sections.collectd_rrdtool.RRASingle == "1" )
        opts.rramax    = opts.rramax    or ( sections.collectd_rrdtool.RRAMax == "1" )
-       opts.host      = opts.host      or sections.collectd.Hostname        or luci.sys.hostname()
+       opts.host      = opts.host      or sections.collectd.Hostname        or sys.hostname()
        opts.width     = opts.width     or sections.rrdtool.image_width      or 400
        opts.rrdpath   = opts.rrdpath   or sections.collectd_rrdtool.DataDir or "/tmp/rrd"
        opts.imgpath   = opts.imgpath   or sections.rrdtool.image_path       or "/tmp/rrdimg"
@@ -34,9 +32,9 @@ function Graph.__init__( self, timespan, opts )
        opts.imgpath   = opts.imgpath:gsub("/$","")
 
        -- helper classes
-       self.colors = luci.statistics.rrdtool.colors.Instance()
-       self.tree   = luci.statistics.datatree.Instance(opts.host)
-       self.i18n   = luci.statistics.i18n.Instance( self )
+       self.colors = colors.Instance()
+       self.tree   = tree.Instance(opts.host)
+       self.i18n   = i18n.Instance( self )
 
        -- rrdtool default args
        self.args = {
@@ -102,7 +100,7 @@ function Graph._rrdtool( self, def, rrd )
                        opt = opt:gsub( "{file}", rrd )
                end
 
-               cmdline[#cmdline+1] = luci.util.shellquote(opt)
+               cmdline[#cmdline+1] = util.shellquote(opt)
        end
 
        -- execute rrdtool

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
index 5b35dff67cb8b9d73db0e39d826fd44f03186fe7..0d3af712fd8a197c7a74d6cead7d32b2992e6fd5 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua
@@ -3,10 +3,10 @@
 
 module("luci.statistics.rrdtool.colors", package.seeall)
 
-require("luci.util")
+local util = require("luci.util")
 
 
-Instance = luci.util.class()
+Instance = util.class()
 
 function Instance.from_string( self, s )
        return {