* luci/statistics: ffluci -> luci conversation

diff --git a/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua
index a30db7c09c6908cc0ae3328bd1294164614618b1..df262a11541d1872302cac7fb3af793c76110315 100644 (file)
--- a/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua
@@ -1,9 +1,9 @@
-module("ffluci.controller.luci_statistics.luci_statistics", package.seeall)
+module("luci.controller.luci_statistics.luci_statistics", package.seeall)
 
-local fs   = require("ffluci.fs")
-local tpl  = require("ffluci.template")
-local rrd  = require("ffluci.statistics.rrdtool")
-local data = require("ffluci.statistics.datatree").Instance()
+local fs   = require("luci.fs")
+local tpl  = require("luci.template")
+local rrd  = require("luci.statistics.rrdtool")
+local data = require("luci.statistics.datatree").Instance()
 
 
 function _entry( path, ... )
@@ -93,7 +93,7 @@ end
 
 
 function statistics_render()
-       local plugin = ffluci.dispatcher.request[3]
+       local plugin = luci.dispatcher.request[3]
        local images = { }
 
        for i, inst in ipairs( data:plugin_instances( plugin ) ) do

diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua
index 21ff457e33b1016b3e881dbdcc15a16f4112ba3d..e09a11df1b7a952fb3e338ead3463bfa2de372f4 100644 (file)
--- a/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua
+++ b/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua
@@ -13,7 +13,7 @@ $Id$
 
 ]]--
 
-require("ffluci.sys")
+require("luci.sys")
 
 
 m = Map("luci_statistics", "Collector Daemon",
@@ -56,7 +56,7 @@ readthreads.isnumber = true
 
 -- general.hostname (Hostname)
 hostname = s:option( Value, "Hostname", "Hostname zur Identifikation des Collector Dienstes (leer lassen um den Namen automatisch zu bestimmen)" )
-hostname.default  = ffluci.sys.hostname()
+hostname.default  = luci.sys.hostname()
 hostname.optional = true
 
 -- general.fqdnlookup (FQDNLookup)

diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua
index ed71a55a3af7dc067cd6c11498b753feb58849e1..dc7f57d68fa2468919fefc9e6a54d96a26df68a2 100644 (file)
--- a/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua
+++ b/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua
@@ -13,7 +13,7 @@ $Id$
 
 ]]--
 
-require("ffluci.sys")
+require("luci.sys")
 
 
 m = Map("luci_statistics", "DNS Plugin",
@@ -30,7 +30,7 @@ enable.default = 0
 interfaces = s:option( ListValue, "Interface", "Folgende Schnittstelle überwachen:" )
 interfaces:depends( "enable", 1 )
 interfaces:value("any")
-for k, v in pairs(ffluci.sys.net.devices()) do
+for k, v in pairs(luci.sys.net.devices()) do
        interfaces:value(v)
 end
 

diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua
index 5acd4e93cab595982765c73bc6537f57d6de9bb5..3cd71a15d4ec86f24a34c2083588b6e0b5a86e77 100644 (file)
--- a/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua
+++ b/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua
@@ -13,7 +13,7 @@ $Id$
 
 ]]--
 
-require("ffluci.sys")
+require("luci.sys")
 
 
 m = Map("luci_statistics", "Interface Plugin",
@@ -30,7 +30,7 @@ enable.default = 0
 interfaces = s:option( MultiValue, "Interfaces", "Überwachte Schnittstellen", "mehrere Einträge mit Strg selektieren" )
 interfaces.widget = "select"
 interfaces:depends( "enable", 1 )
-for k, v in pairs(ffluci.sys.net.devices()) do
+for k, v in pairs(luci.sys.net.devices()) do
        interfaces:value(v)
 end
 

diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua
index 4757295897be623662216959ff835d019ffd5b58..4b6d9dbf43ef31b69cf52be089acd0ec0b349d2c 100644 (file)
--- a/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua
+++ b/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua
@@ -13,9 +13,9 @@ $Id$
 
 ]]--
 
-require("ffluci.sys.iptparser")
+require("luci.sys.iptparser")
 
-ip = ffluci.sys.iptparser.IptParser()
+ip = luci.sys.iptparser.IptParser()
 chains  = { }
 targets = { }
 

diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua
index 478560f9732974f9b34de093c738912f39b74802..a27def8eb05d1d5280c437ab562d6da30ed1249a 100644 (file)
--- a/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua
+++ b/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua
@@ -13,7 +13,7 @@ $Id$
 
 ]]--
 
-require("ffluci.sys")
+require("luci.sys")
 
 
 m = Map("luci_statistics", "Interface Plugin",
@@ -32,7 +32,7 @@ interfaces.widget   = "select"
 interfaces.optional = true
 interfaces:depends( "enable", 1 )
 interfaces:value("")
-for i, v in ipairs(ffluci.sys.net.devices()) do
+for i, v in ipairs(luci.sys.net.devices()) do
        interfaces:value(v)
 end
 
@@ -42,7 +42,7 @@ verboseinterfaces.widget   = "select"
 verboseinterfaces.optional = true
 verboseinterfaces:depends( "enable", 1 )
 verboseinterfaces:value("")
-for i, v in ipairs(ffluci.sys.net.devices()) do
+for i, v in ipairs(luci.sys.net.devices()) do
        verboseinterfaces:value(v)
 end
 
@@ -52,7 +52,7 @@ qdiscs.widget   = "select"
 qdiscs.optional = true
 qdiscs:depends( "enable", 1 )
 qdiscs:value("")
-for i, v in ipairs(ffluci.sys.net.devices()) do
+for i, v in ipairs(luci.sys.net.devices()) do
         qdiscs:value(v)
 end
 
@@ -62,7 +62,7 @@ classs.widget   = "select"
 classs.optional = true
 classs:depends( "enable", 1 )
 classs:value("")
-for i, v in ipairs(ffluci.sys.net.devices()) do
+for i, v in ipairs(luci.sys.net.devices()) do
         classs:value(v)
 end
 
@@ -72,7 +72,7 @@ filters.widget   = "select"
 filters.optional = true
 filters:depends( "enable", 1 )
 filters:value("")
-for i, v in ipairs(ffluci.sys.net.devices()) do
+for i, v in ipairs(luci.sys.net.devices()) do
         filters:value(v)
 end
 

diff --git a/applications/luci-statistics/src/statistics/datatree.lua b/applications/luci-statistics/src/statistics/datatree.lua
index 99e7e444251225326f8260a02053b9c8bec748e9..957b230a96b35cbb36dd901d6f7622e21a61c8c4 100644 (file)
--- a/applications/luci-statistics/src/statistics/datatree.lua
+++ b/applications/luci-statistics/src/statistics/datatree.lua
@@ -1,9 +1,9 @@
-module("ffluci.statistics.datatree", package.seeall)
+module("luci.statistics.datatree", package.seeall)
 
-local util = require("ffluci.util")
-local sys  = require("ffluci.sys")
-local fs   = require("ffluci.fs")
-local uci  = require("ffluci.model.uci").Session()
+local util = require("luci.util")
+local sys  = require("luci.sys")
+local fs   = require("luci.fs")
+local uci  = require("luci.model.uci").Session()
 local sections, names = uci:sections( "luci_statistics" )
 
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool.lua b/applications/luci-statistics/src/statistics/rrdtool.lua
index 97772cc38fbabb3e5749066df2fb170133745bf9..b399866a8599eda0ae0c449fa216433d95a360ab 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool.lua
@@ -1,23 +1,23 @@
-module("ffluci.statistics.rrdtool", package.seeall)
+module("luci.statistics.rrdtool", package.seeall)
 
-require("ffluci.statistics.datatree")
-require("ffluci.statistics.rrdtool.colors")
-require("ffluci.statistics.rrdtool.definitions")
-require("ffluci.util")
-require("ffluci.bits")
-require("ffluci.fs")
+require("luci.statistics.datatree")
+require("luci.statistics.rrdtool.colors")
+require("luci.statistics.rrdtool.definitions")
+require("luci.util")
+require("luci.bits")
+require("luci.fs")
 
 
-Graph = ffluci.util.class()
+Graph = luci.util.class()
 
 function Graph.__init__( self, timespan, opts )
 
        opts = opts or { }
        opts.width = opts.width or "400"
 
-       self.colors = ffluci.statistics.rrdtool.colors.Instance()
-       self.defs   = ffluci.statistics.rrdtool.definitions.Instance()
-       self.tree   = ffluci.statistics.datatree.Instance()
+       self.colors = luci.statistics.rrdtool.colors.Instance()
+       self.defs   = luci.statistics.rrdtool.definitions.Instance()
+       self.tree   = luci.statistics.datatree.Instance()
 
        -- rrdtool defalt args
        self.args   = {
@@ -77,7 +77,7 @@ function Graph._rrdtool( self, png, rrd )
 
        -- prepare directory
        local dir = png:gsub("/[^/]+$","")
-       ffluci.fs.mkdir( dir, true )
+       luci.fs.mkdir( dir, true )
 
        -- construct commandline
        local cmdline = "rrdtool graph " .. png
@@ -195,7 +195,7 @@ function Graph.render( self, host, plugin, plugin_instance )
        local pngs = { }
 
        -- check for a whole graph handler
-       local plugin_def = "ffluci.statistics.rrdtool.definitions." .. plugin
+       local plugin_def = "luci.statistics.rrdtool.definitions." .. plugin
        local stat, def = pcall( require, plugin_def )
 
        if stat and def and type(def.rrdargs) == "function" then

diff --git a/applications/luci-statistics/src/statistics/rrdtool/colors.lua b/applications/luci-statistics/src/statistics/rrdtool/colors.lua
index cd1e52d1990a6b579630647e88891decaa9c3bac..cdd6f71057e2069c256000b01e287eebbe37e031 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/colors.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/colors.lua
@@ -1,16 +1,16 @@
-module("ffluci.statistics.rrdtool.colors", package.seeall)
+module("luci.statistics.rrdtool.colors", package.seeall)
 
-require("ffluci.util")
-require("ffluci.bits")
+require("luci.util")
+require("luci.bits")
 
 
-Instance = ffluci.util.class()
+Instance = luci.util.class()
 
 function Instance.from_string( self, s )
        return {
-               ffluci.bits.Hex2Dec(s:sub(1,2)),
-               ffluci.bits.Hex2Dec(s:sub(3,4)),
-               ffluci.bits.Hex2Dec(s:sub(5,6))
+               luci.bits.Hex2Dec(s:sub(1,2)),
+               luci.bits.Hex2Dec(s:sub(3,4)),
+               luci.bits.Hex2Dec(s:sub(5,6))
        }
 end
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua
index 9d06fa4b6d3930b6c945f5da4737fd0e63f7758e..add69e4b648e980226bd00d5029b7ab4b33af6b3 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua
@@ -1,10 +1,10 @@
-module("ffluci.statistics.rrdtool.definitions", package.seeall)
+module("luci.statistics.rrdtool.definitions", package.seeall)
 
-require("ffluci.util")
-require("ffluci.fs")
+require("luci.util")
+require("luci.fs")
 
 
-Instance = ffluci.util.class()
+Instance = luci.util.class()
 
 function Instance.__init__( self, ... )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua
index 557c5dafe106ca69ea09abaa45a03fd8edbea4ba..2626d276d1dd067bd2fb54bc77e873b2ebaf82d0 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.cpu.cpu",package.seeall)
+module("luci.statistics.rrdtool.definitions.cpu.cpu",package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance, dtype )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua
index 1b45e25a91df5179333c4c543b6fd654543a0df2..b16add995dc531f09fad0b58379dcace8852cc9f 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall)
+module("luci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance, dtype )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua
index de3924dc746f157ccc3757b6f0c509cb0bfbfe20..3cee6abc0092ed422b092b08a547f6ba163b3efd 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.netlink", package.seeall)
+module("luci.statistics.rrdtool.definitions.netlink", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua
index 48a5673adaea1a6f98d1f43ceeb788f88594939c..b041c015daf67acb9d038e7ad4e8495a33b6d210 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.ping.ping", package.seeall)
+module("luci.statistics.rrdtool.definitions.ping.ping", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance, dtype )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua
index 4261e09890b8bdb98688d844629e768b85e2d272..07cbe1d4af956c2697e49aafbb51be03204b33ca 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.processes.ps_state", package.seeall)
+module("luci.statistics.rrdtool.definitions.processes.ps_state", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance, dtype )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
index 81860d0990d2f88c1409305324149cff183b7430..0493574948890204b9f5f2cbf3f103f40acc3c6f 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall)
+module("luci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance, dtype )
 

diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua
index 5b3acc51f8ef3f367c37e4204f0813cd5f6db665..e315ca52102e46558812a5a4a738e47ba7d1eef3 100644 (file)
--- a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua
+++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua
@@ -1,4 +1,4 @@
-module("ffluci.statistics.rrdtool.definitions.wireless", package.seeall)
+module("luci.statistics.rrdtool.definitions.wireless", package.seeall)
 
 function rrdargs( graph, host, plugin, plugin_instance )
 

diff --git a/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm
index 0c6d7f7ad34b6c5ca97d2242069a2aea273f53a5..d3aa87eb174155d9803c3e5328407725407df0e4 100644 (file)
--- a/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm
+++ b/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm
@@ -8,8 +8,8 @@ auf verschiedenen Schnittstellen, DNS-Verkehr u.v.m.%></p>
 <p><%:stat_networkplugins_installed Installierte Netzwerkplugins:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if ffluci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
-                               <li><a href="/cgi-bin/ffluci/admin/statistics/network/<%=plugin%>"><%=desc%></a></li>
+                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                               <li><a href="/cgi-bin/luci/admin/statistics/network/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>
        </ul>

diff --git a/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm
index ed8651407441751e62b3769a81fc60be800e94d7..5a8a76045a99b8bca11118af0164dfce3db0aab0 100644 (file)
--- a/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm
+++ b/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm
@@ -9,8 +9,8 @@ die gesammelten Werte in RRD-Datenbanken zu sichern und zusätzlich über das Ne
 <p><%:stat_outputplugins_installed Installierte Ausgabeplugins:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if ffluci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
-                               <li><a href="/cgi-bin/ffluci/admin/statistics/output/<%=plugin%>"><%=desc%></a></li>
+                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                               <li><a href="/cgi-bin/luci/admin/statistics/output/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>
        </ul>

diff --git a/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm
index cbb469a1f104644c3af504b86753f3639f8fe175..2a32bf5ca944fe0681a6e52b5c948048daf6eefe 100644 (file)
--- a/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm
+++ b/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm
@@ -8,8 +8,8 @@ auf dem Gerät.%></p>
 <p><%:stat_systemplugins_installed Installierte Systemplugins:%>
        <ul>
                <% for plugin, desc in pairs(plugins) do %>
-                       <% if ffluci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
-                               <li><a href="/cgi-bin/ffluci/admin/statistics/system/<%=plugin%>"><%=desc%></a></li>
+                       <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %>
+                               <li><a href="/cgi-bin/luci/admin/statistics/system/<%=plugin%>"><%=desc%></a></li>
                        <% end %>
                <% end %>
        </ul>