From 256a336f0ecf212569f726a1e4c70068ee1b8904 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 7 Sep 2020 14:57:32 +0200 Subject: [PATCH] luci-app-mwan3: unify map, section and option variable handling in globalsconfig Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/mwan/globalsconfig.lua | 70 ++++++++----------- 1 file changed, 31 insertions(+), 39 deletions(-) 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 b71c2886a1..94ff3fae9d 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua @@ -3,61 +3,53 @@ local net = require "luci.model.network".init() -local s, m, mask, rtmon, rtlookup, logging, loglevel +local s, m, o m = Map("mwan3", translate("MWAN - Globals")) s = m:section(NamedSection, "globals", "globals", nil) -mask = s:option( - Value, - "mmx_mask", +o = s:option(Value, "mmx_mask", translate("Firewall mask"), translate("Enter value in hex, starting with 0x")) -mask.datatype = "hex(4)" -mask.default = "0xff00" +o.datatype = "hex(4)" +o.default = "0xff00" -logging = s:option(Flag, - "logging", +o = s:option(Flag, "logging", translate("Logging"), translate("Enables global firewall logging")) -loglevel = s:option( - ListValue, - "loglevel", +o = s:option(ListValue, "loglevel", translate("Loglevel"), translate("Firewall loglevel")) -loglevel.default = "notice" -loglevel:value("emerg", translate("Emergency")) -loglevel:value("alert", translate("Alert")) -loglevel:value("crit", translate("Critical")) -loglevel:value("error", translate("Error")) -loglevel:value("warning", translate("Warning")) -loglevel:value("notice", translate("Notice")) -loglevel:value("info", translate("Info")) -loglevel:value("debug", translate("Debug")) -loglevel:depends("logging", "1") - -rtmon = s:option( - Value, - "rtmon_interval", +o.default = "notice" +o:value("emerg", translate("Emergency")) +o:value("alert", translate("Alert")) +o:value("crit", translate("Critical")) +o:value("error", translate("Error")) +o:value("warning", translate("Warning")) +o:value("notice", translate("Notice")) +o:value("info", translate("Info")) +o:value("debug", translate("Debug")) +o:depends("logging", "1") + +o = s:option(Value, "rtmon_interval", translate("Update interval"), translate("How often should rtmon update the interface routing table")) -rtmon.datatype = "integer" -rtmon.default = "5" -rtmon:value("1", translatef("%d second", 1)) -rtmon:value("3", translatef("%d seconds", 3)) -rtmon:value("5", translatef("%d seconds", 5)) -rtmon:value("7", translatef("%d seconds", 7)) -rtmon:value("10", translatef("%d seconds", 10)) - -rtlookup = s:option(DynamicList, - "rt_table_lookup", +o.datatype = "integer" +o.default = "5" +o:value("1", translatef("%d second", 1)) +o:value("3", translatef("%d seconds", 3)) +o:value("5", translatef("%d seconds", 5)) +o:value("7", translatef("%d seconds", 7)) +o:value("10", translatef("%d seconds", 10)) + +o = s:option(DynamicList, "rt_table_lookup", translate("Routing table lookup"), translate("Also scan this Routing table for connected networks")) -rtlookup.datatype = "integer" -rtlookup:value("1", translatef("Routing table %d", 1)) -rtlookup:value("2", translatef("Routing table %d", 2)) -rtlookup:value("220", translatef("Routing table %d", 220)) +o.datatype = "integer" +o:value("1", translatef("Routing table %d", 1)) +o:value("2", translatef("Routing table %d", 2)) +o:value("220", translatef("Routing table %d", 220)) return m -- 2.30.2