Merge pull request #1703 from dibdot/travelmate

luci-app-travelmate: made "ignore bssid" flag conditional

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 4b1a070..14bf138 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -8,37 +8,37 @@ dsp = require "luci.dispatcher"
 function interfaceWarnings(overview, count)
        local warnings = ""
        if count <= 250 then
-               warnings = string.format("<strong>%s</strong></br>",
+               warnings = string.format("<strong>%s</strong><br />",
                        translatef("There are currently %d of 250 supported interfaces configured", count)
                        )
        else
-               warnings = string.format("<strong>%s</strong></br>",
+               warnings = string.format("<strong>%s</strong><br />",
                        translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", count)
                        )
        end
 
        for i, k in pairs(overview) do
                if overview[i]["network"] == false then
-                       warnings = warnings .. string.format("<strong>%s</strong></br>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                        translatef("WARNING: Interface %s are not found in /etc/config/network", i)
                                        )
                end
 
                if overview[i]["default_route"] == false then
-                       warnings = warnings .. string.format("<strong>%s</strong></br>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                translatef("WARNING: Interface %s has no default route in the main routing table", i)
                                )
                end
 
                if overview[i]["reliability"] == false then
-                       warnings = warnings .. string.format("<strong>%s</strong></br>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                translatef("WARNING: Interface %s has a higher reliability " ..
                                "requirement than tracking hosts (%d)", i, overview[i]["tracking"])
                                )
                end
 
                if overview[i]["duplicate_metric"] == true then
-                       warnings = warnings .. string.format("<strong>%s</strong></br>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                translatef("WARNING: Interface %s has a duplicate metric %s configured", i, overview[i]["metric"])
                                )
                end

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 6f87a3d..4c6e210 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua
@@ -23,7 +23,11 @@ f = m5:section(SimpleSection, nil,
        "<br />" ..
        "There are three main environment variables that are passed to this script.<br />" ..
        "<br />" ..
-       "$ACTION Either \"ifup\" or \"ifdown\"<br />" ..
+       "$ACTION <br />" ..
+       "* \"ifup\" Is called by netifd and mwan3track <br />" ..
+       "* \"ifdown\" Is called by netifd and mwan3track <br />" ..
+       "* \"connected\" Is only called by mwan3track if tracking was successful <br />" ..
+       "* \"disconnected\" Is only called by mwan3track if tracking has failed <br />" ..
        "$INTERFACE Name of the interface which went up or down (e.g. \"wan\" or \"wwan\")<br />" ..
        "$DEVICE Physical device name which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br />" ..
        "<br />"))

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 7f12782..c4567f7 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -24,7 +24,7 @@ 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>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                translatef("WARNING: Policie %s has exceeding the maximum name of 15 characters", i)
                                )
                end

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 cb2a995..fb885f8 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -28,7 +28,7 @@ function ruleWarn(rule_error)
        local warnings = ""
        for i, k in pairs(rule_error) do
                if rule_error[i] == true then
-                       warnings = warnings .. string.format("<strong>%s</strong></br>",
+                       warnings = warnings .. string.format("<strong>%s</strong><br />",
                                translatef("WARNING: Rule %s have a port configured with no or improper protocol specified!", i)
                                )
                end