--- ------ extra functions ------ --
+-- Copyright 2014 Aedan Renner <chipdankly@gmail.com>
+-- Copyright 2018 Florian Eckert <fe@dev.tdt.de>
+-- Licensed to the public under the GNU General Public License v2.
+
+dsp = require "luci.dispatcher"
+uci = require "uci"
+
+
+function policyCheck()
+ local policy_error = {}
-function policyCheck() -- check to see if any policy names exceed the maximum of 15 characters
uci.cursor():foreach("mwan3", "policy",
function (section)
+ policy_error[section[".name"]] = false
if string.len(section[".name"]) > 15 then
- nameTooLong = 1
- err_name_list = err_name_list .. section[".name"] .. " "
+ policy_error[section[".name"]] = true
end
end
)
-end
-function policyWarn() -- display status and warning messages at the top of the page
- if nameTooLong == 1 then
- return "<font color=\"ff0000\"><strong>" .. translate("WARNING: Some policies have names exceeding the maximum of 15 characters!") .. "</strong></font>"
- else
- return ""
- end
+ return policy_error
end
--- ------ policy configuration ------ --
-
-ds = require "luci.dispatcher"
-sys = require "luci.sys"
-
-nameTooLong = 0
-err_name_list = " "
-policyCheck()
+function policyError(policy_error)
+ local warnings = ""
+ for i, k in pairs(policy_error) do
+ if policy_error[i] == true then
+ warnings = warnings .. string.format("<strong>%s</strong><br />",
+ translatef("WARNING: Policy %s has exceeding the maximum name of 15 characters", i)
+ )
+ end
+ end
+ return warnings
+end
m5 = Map("mwan3", translate("MWAN - Policies"),
- policyWarn())
- m5:append(Template("mwan/config_css"))
-
+ policyError(policyCheck()))
mwan_policy = m5:section(TypedSection, "policy", nil,
translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" ..
- "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" ..
+ "Member interfaces with lower metrics are used first<br />" ..
+ "Member interfaces with the same metric will be load-balanced<br />" ..
"Load-balanced member interfaces distribute more traffic out those with higher weights<br />" ..
- "Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be 15 characters or less<br />" ..
+ "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
+ "Names must be 15 characters or less<br />" ..
"Policies may not share the same name as configured interfaces, members or rules"))
- mwan_policy.addremove = true
- mwan_policy.dynamic = false
- 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")
- 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))
- end
-
+mwan_policy.addremove = true
+mwan_policy.dynamic = false
+mwan_policy.sectionhead = translate("Policy")
+mwan_policy.sortable = true
+mwan_policy.template = "cbi/tblsection"
+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(dsp.build_url("admin", "network", "mwan", "policy", section))
+end
use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned"))
- use_member.rawhtml = true
- function use_member.cfgvalue(self, s)
- local memberConfig, memberList = self.map:get(s, "use_member"), ""
- if memberConfig then
- for k,v in pairs(memberConfig) do
- memberList = memberList .. v .. "<br />"
- end
- return memberList
- else
- return "—"
+use_member.rawhtml = true
+function use_member.cfgvalue(self, s)
+ local memberConfig, memberList = self.map:get(s, "use_member"), ""
+ if memberConfig then
+ for k,v in pairs(memberConfig) do
+ memberList = memberList .. v .. "<br />"
end
+ return memberList
+ else
+ return "—"
end
+end
last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort"))
- last_resort.rawhtml = true
- function last_resort.cfgvalue(self, s)
- local action = self.map:get(s, "last_resort")
- if action == "blackhole" then
- return translate("blackhole (drop)")
- elseif action == "default" then
- return translate("default (use main routing table)")
- else
- return translate("unreachable (reject)")
- end
- end
-
-errors = mwan_policy:option(DummyValue, "errors", translate("Errors"))
- errors.rawhtml = true
- function errors.cfgvalue(self, s)
- if not string.find(err_name_list, " " .. s .. " ") then
- return ""
- else
- return "<span title=\"Name exceeds 15 characters\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
- end
+last_resort.rawhtml = true
+function last_resort.cfgvalue(self, s)
+ local action = self.map:get(s, "last_resort")
+ if action == "blackhole" then
+ return translate("blackhole (drop)")
+ elseif action == "default" then
+ return translate("default (use main routing table)")
+ else
+ return translate("unreachable (reject)")
end
-
+end
return m5
projects / project / luci.git / blobdiff