luci-app-mwan3: remove/unify lua require order

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

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua
index 3e1a28325bce5117ce5e70526249f00567ad3257..b53d288d0dbd3472a4a87f40ca9b688ba98f01b5 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua
@@ -14,12 +14,14 @@ $Id$
 
 local net = require "luci.model.network".init()
 
+
 m = Map("mwan3", translate("MWAN - Globals"))
 
 s = m:section(NamedSection, "globals", "globals", nil)
 n = s:option(ListValue, "local_source",
        translate("Local source interface"),
-       translate("Use the IP address of this interface as source IP address for traffic initiated by the router itself"))
+       translate("Use the IP address of this interface as source IP " ..
+       "address for traffic initiated by the router itself"))
 n:value("none")
 n.default = "none"
 for _, net in ipairs(net:get_networks()) do

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
index 01f18dae4a426571df35deee7320d844d6da3b91..f80319327e9069d273cb35099fd8e3025140d25b 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -1,6 +1,5 @@
 dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
+
 
 function interfaceWarnings(overview, count)
        local warnings = ""

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index 07ccd2d59f302467b010e1b4a30d1d4a61c44234..01b96da41a2264447e608152f16c400a8f179b9c 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -1,6 +1,4 @@
 dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
 arg[1] = arg[1] or ""
 
 

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
index 0865fccaf7b233b139c2f3a347b1647fb74796ae..63e511e53cd03b6c504412ca8053fd9dc8f4250a 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
@@ -1,4 +1,4 @@
-ds = require "luci.dispatcher"
+dsp = require "luci.dispatcher"
 
 
 m5 = Map("mwan3", translate("MWAN - Members"))
@@ -12,11 +12,11 @@ mwan_member = m5:section(TypedSection, "member", nil,
        mwan_member.sectionhead = translate("Member")
        mwan_member.sortable = true
        mwan_member.template = "cbi/tblsection"
-       mwan_member.extedit = ds.build_url("admin", "network", "mwan", "member", "%s")
+       mwan_member.extedit = dsp.build_url("admin", "network", "mwan", "member", "%s")
        function mwan_member.create(self, section)
                TypedSection.create(self, section)
                m5.uci:save("mwan3")
-               luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section))
+               luci.http.redirect(dsp.build_url("admin", "network", "mwan", "member", section))
        end
 
 interface = mwan_member:option(DummyValue, "interface", translate("Interface"))

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
index 14237e60f4f4db42d46b355c98a59d77fcb6dc3c..1019302ac9666de6d77efa77c2a61ba7bb3c8eaa 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
@@ -1,9 +1,8 @@
--- ------ hotplug script configuration ------ --
-
 local fs = require "nixio.fs"
 local ut = require "luci.util"
 script = "/etc/mwan3.user"
 
+
 m5 = SimpleForm("luci", translate("MWAN - Notification"))
 
 f = m5:section(SimpleSection, nil,

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
index 44585d75efd228cb473ab77f3aaed8289ca37da2..6340359fae20b5ad18add6f9461937e99f028321 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -1,5 +1,5 @@
-ds = require "luci.dispatcher"
-sys = require "luci.sys"
+dsp = require "luci.dispatcher"
+
 
 function policyCheck()
        local policy_error = {}
@@ -44,11 +44,11 @@ mwan_policy = m5:section(TypedSection, "policy", nil,
        mwan_policy.sectionhead = translate("Policy")
        mwan_policy.sortable = true
        mwan_policy.template = "cbi/tblsection"
-       mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "policy", "%s")
+       mwan_policy.extedit = dsp.build_url("admin", "network", "mwan", "policy", "%s")
        function mwan_policy.create(self, section)
                TypedSection.create(self, section)
                m5.uci:save("mwan3")
-               luci.http.redirect(ds.build_url("admin", "network", "mwan", "policy", section))
+               luci.http.redirect(dsp.build_url("admin", "network", "mwan", "policy", section))
        end
 
 

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua
index f29a06093a27b4dd8ed3084e44a9c9ca6fe61c4a..29bb3dcd88da1bb46c5f275d03e52812706aa439 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua
@@ -1,6 +1,7 @@
 dsp = require "luci.dispatcher"
 arg[1] = arg[1] or ""
 
+
 m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1]))
 m5.redirect = dsp.build_url("admin", "network", "mwan", "policy")
 

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
index d71cb2bc1f7db0af04bec6b1a165337f8f600825..5c6329e3397d66a5231d8a1dbeb64b83710ec30a 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -1,6 +1,5 @@
 dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
+
 
 function ruleCheck()
        local rule_error = {}

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
index 756e089404926b283dd1219ab7d261ed43619b6e..e12639e33dd2169acd52804200a063f7460ebf39 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
@@ -1,8 +1,7 @@
 dsp = require "luci.dispatcher"
-sys = require "luci.sys"
-ut = require "luci.util"
 arg[1] = arg[1] or ""
 
+
 m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]))
 m5.redirect = dsp.build_url("admin", "network", "mwan", "rule")