Merge pull request #1526 from TDT-AG/pr/20180111-luci-app-mwan3-refactoring

luci-app-mwan3: refactoring 

12 files changed, 23 insertions, 121 deletions

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_mwanconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_mwanconfig.lua
deleted file mode 100644
index e0a99e8366..0000000000
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_mwanconfig.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- ------ mwan configuration ------ --
-
-ut = require "luci.util"
-
-mwanConfig = "/etc/config/mwan3"
-
-
-m5 = SimpleForm("luci", nil)
-	m5:append(Template("mwan/advanced_mwanconfig")) -- highlight current tab
-
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/config/mwan3"))
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		return nixio.fs.readfile(mwanConfig) or ""
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return nixio.fs.writefile(mwanConfig, "\n" .. ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-	function f.handle(self, state, data)
-		return true
-	end
-
-
-return m5
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_networkconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_networkconfig.lua
deleted file mode 100644
index b93d89751b..0000000000
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_networkconfig.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- ------ network configuration ------ --
-
-ut = require "luci.util"
-
-networkConfig = "/etc/config/network"
-
-
-m5 = SimpleForm("networkconf", nil)
-	m5:append(Template("mwan/advanced_networkconfig")) -- highlight current tab
-
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/config/network"))
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		return nixio.fs.readfile(networkConfig) or ""
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return nixio.fs.writefile(networkConfig, "\n" .. ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-	function f.handle(self, state, data)
-		return true
-	end
-
-
-return m5
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_wirelessconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_wirelessconfig.lua
deleted file mode 100644
index 95e9f7c7e5..0000000000
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_wirelessconfig.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- ------ wireless configuration ------ --
-
-ut = require "luci.util"
-
-wirelessConfig = "/etc/config/wireless"
-
-
-m5 = SimpleForm("wirelessconf", nil)
-	m5:append(Template("mwan/advanced_wirelessconfig")) -- highlight current tab
-
-
-f = m5:section(SimpleSection, nil,
-	translate("This section allows you to modify the contents of /etc/config/wireless"))
-
-t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-
-	function t.cfgvalue()
-		return nixio.fs.readfile(wirelessConfig) or ""
-	end
-
-	function t.write(self, section, data) -- format and write new data to script
-		return nixio.fs.writefile(wirelessConfig, "\n" .. ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
-
-	function f.handle(self, state, data)
-		return true
-	end
-
-
-return m5
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 5ee5fb39f3..77198d5c39 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -114,11 +114,11 @@ mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"),
 	mwan_interface.sectionhead = translate("Interface")
 	mwan_interface.sortable = false
 	mwan_interface.template = "cbi/tblsection"
-	mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s")
+	mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "interface", "%s")
 	function mwan_interface.create(self, section)
 		TypedSection.create(self, section)
 		m5.uci:save("mwan3")
-		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "interface", section))
+		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section))
 	end
 
 
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 a7d7c5af7e..86e959771e 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -89,7 +89,7 @@ interfaceCheck()
 
 m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1]),
 	interfaceWarnings())
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "interface")
+	m5.redirect = dsp.build_url("admin", "network", "mwan", "interface")
 
 
 mwan_interface = m5:section(NamedSection, arg[1], "interface", "")
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 efbe8f7902..b73ee57652 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
@@ -16,11 +16,11 @@ mwan_member = m5:section(TypedSection, "member", translate("Members"),
 	mwan_member.sectionhead = translate("Member")
 	mwan_member.sortable = true
 	mwan_member.template = "cbi/tblsection"
-	mwan_member.extedit = ds.build_url("admin", "network", "mwan", "configuration", "member", "%s")
+	mwan_member.extedit = ds.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", "configuration", "member", section))
+		luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section))
 	end
 
 
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua
index dc2e0da447..220c4bddd6 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua
@@ -15,7 +15,7 @@ arg[1] = arg[1] or ""
 
 
 m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1]))
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "member")
+	m5.redirect = dsp.build_url("admin", "network", "mwan", "member")
 
 
 mwan_member = m5:section(NamedSection, arg[1], "member", "")
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_hotplugscript.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
index 1b97080216..20e86fc027 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/advanced_hotplugscript.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
@@ -1,14 +1,12 @@
 -- ------ hotplug script configuration ------ --
 
-fs = require "nixio.fs"
-ut = require "luci.util"
-
+local fs = require "nixio.fs"
+local ut = require "luci.util"
 script = "/etc/mwan3.user"
 
 m5 = SimpleForm("luci", nil)
-	m5:append(Template("mwan/advanced_hotplugscript")) -- highlight current tab
 
-f = m5:section(SimpleSection, nil,
+f = m5:section(SimpleSection, translate("MWAN Notification"),
 	translate("This section allows you to modify the content of \"/etc/mwan3.user\".<br />" ..
 	"The file is also preserved during sysupgrade.<br />" ..
 	"<br />" ..
@@ -28,13 +26,13 @@ f = m5:section(SimpleSection, nil,
 	"<br />"))
 
 t = f:option(TextValue, "lines")
-	t.rmempty = true
-	t.rows = 20
-	function t.cfgvalue()
-		return fs.readfile(script)
-	end
-	function t.write(self, section, data) -- format and write new data to script
-		return fs.writefile(script, ut.trim(data:gsub("\r\n", "\n")) .. "\n")
-	end
+t.rmempty = true
+t.rows = 20
+function t.cfgvalue()
+	return fs.readfile(script)
+end
+function t.write(self, section, data)
+	return fs.writefile(script, ut.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
 
 return m5
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 6640564d50..495b45e646 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -45,11 +45,11 @@ mwan_policy = m5:section(TypedSection, "policy", translate("Policies"),
 	mwan_policy.sectionhead = translate("Policy")
 	mwan_policy.sortable = true
 	mwan_policy.template = "cbi/tblsection"
-	mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "configuration", "policy", "%s")
+	mwan_policy.extedit = ds.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", "configuration", "policy", section))
+		luci.http.redirect(ds.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 feb62dc8a3..cdf6521a79 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua
@@ -34,7 +34,7 @@ policyCheck()
 
 m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1]),
 	policyWarn())
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "policy")
+	m5.redirect = dsp.build_url("admin", "network", "mwan", "policy")
 
 
 mwan_policy = m5:section(NamedSection, arg[1], "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 9cb4756fc8..586f174b28 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -50,11 +50,11 @@ mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"),
 	mwan_rule.sectionhead = translate("Rule")
 	mwan_rule.sortable = true
 	mwan_rule.template = "cbi/tblsection"
-	mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "rule", "%s")
+	mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "rule", "%s")
 	function mwan_rule.create(self, section)
 		TypedSection.create(self, section)
 		m5.uci:save("mwan3")
-		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "configuration", "rule", section))
+		luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section))
 	end
 
 
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 cb1b45d261..87c4691af4 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
@@ -47,7 +47,7 @@ ruleCheck()
 
 m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]),
 	ruleWarn())
-	m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "rule")
+	m5.redirect = dsp.build_url("admin", "network", "mwan", "rule")
 
 
 mwan_rule = m5:section(NamedSection, arg[1], "rule", "")