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

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

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
index 663a3f12d4a5e579babc59ca9e9d07648b546a15..b380febac0ba7c20fd222594f82df323fca432ee 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
@@ -1,7 +1,7 @@
 -- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.sys")
+local sys = require("luci.sys")
 
 
 m = Map("luci_statistics",
@@ -17,7 +17,7 @@ s = m:section( NamedSection, "collectd", "luci_statistics" )
 
 -- general.hostname (Hostname)
 hostname = s:option( Value, "Hostname", translate("Hostname") )
-hostname.default  = luci.sys.hostname()
+hostname.default  = sys.hostname()
 hostname.optional = true
 
 -- general.basedir (BaseDir)

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
index dafcc452ccfd87e76a3a44d9eae16e3663fb12e4..4245018661d1c67aa0e529def4474b561ad9fe95 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua
@@ -1,7 +1,7 @@
 -- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.sys")
+local sys = require("luci.sys")
 
 
 m = Map("luci_statistics",
@@ -24,7 +24,7 @@ interfaces.widget = "select"
 interfaces.size   = 5
 interfaces:depends( "enable", 1 )
 interfaces:value("any")
-for k, v in pairs(luci.sys.net.devices()) do
+for k, v in pairs(sys.net.devices()) do
         interfaces:value(v)
 end
          

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
index 752212f4d40416bbf0ca5f15fe1edab27d09decb..60c88d072c6e42f089c89eccb027b3ad5f1b039d 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua
@@ -1,7 +1,7 @@
 -- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.sys")
+local sys = require("luci.sys")
 
 
 m = Map("luci_statistics",
@@ -23,7 +23,7 @@ interfaces = s:option( MultiValue, "Interfaces", translate("Monitor interfaces")
 interfaces.widget = "select"
 interfaces.size   = 5
 interfaces:depends( "enable", 1 )
-for k, v in pairs(luci.sys.net.devices()) do
+for k, v in pairs(sys.net.devices()) do
        interfaces:value(v)
 end
 

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
index ded3f7f996b96c6a497755ec541b37bda9ba1d85..375a15bf1a281955eaf815ec5a91d03c71250f54 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
@@ -1,13 +1,12 @@
 -- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.sys.iptparser")
+local ip = require("luci.sys.iptparser").IptParser()
 
-ip = luci.sys.iptparser.IptParser()
-chains  = { }
-targets = { }
+local chains  = { }
+local targets = { }
 
-for i, rule in ipairs( ip:find() ) do 
+for i, rule in ipairs( ip:find() ) do
        if rule.chain and rule.target then
                chains[rule.chain] = true
                targets[rule.target] = true

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
index 66449ec467341916c9beab1db97e7b4bb79150cc..784ad1fdbb3df5e93f3919fab8f1e25e34ccfc74 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
@@ -1,9 +1,9 @@
 -- Copyright 2008 Freifunk Leipzig / Jo-Philipp Wich <jow@openwrt.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.sys")
+local sys = require("luci.sys")
 
-local devices = luci.sys.net.devices()
+local devices = sys.net.devices()
 
 
 m = Map("luci_statistics",