diff options
Diffstat (limited to 'applications/luci-app-adblock/luasrc')
| -rw-r--r-- | applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua | 79 | ||||
| -rw-r--r-- | applications/luci-app-adblock/luasrc/view/adblock/config_css.htm | 3 |
2 files changed, 45 insertions, 37 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua index e2ef1ef214..4bb404c25c 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua @@ -9,9 +9,9 @@ local dump = util.ubus("network.interface", "dump", {}) local json = require("luci.jsonc") local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" -if not uci:get_first("adblock", "adblock", "adb_trigger") then - m = SimpleForm("error", nil, translate("Please update your adblock config file to use this package. ") - .. translatef("In OPKG use the '--force-maintainer' option to overwrite the pre-existing config file or download a fresh default config from " +if not uci:get("adblock", "extra") then + m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />") + .. translatef("During opkg package installation use the '--force-maintainer' option to overwrite the pre-existing config file or download a fresh default config from " .. "<a href=\"%s\" target=\"_blank\">" .. "here</a>", "https://raw.githubusercontent.com/openwrt/packages/master/net/adblock/files/adblock.conf")) m.submit = false @@ -23,16 +23,10 @@ m = Map("adblock", translate("Adblock"), translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ") .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" - .. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md")) + .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md")) function m.on_after_commit(self) - function e4.validate(self, value) - if value == "0" then - luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1") - else - luci.sys.call("/etc/init.d/adblock start >/dev/null 2>&1") - end - end + luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock")) end @@ -44,7 +38,7 @@ local parse = json.parse(fs.readfile(adbinput) or "") if parse then status = parse.data.adblock_status version = parse.data.adblock_version - domains = parse.data.blocked_domains + domains = parse.data.overall_domains fetch = parse.data.fetch_utility backend = parse.data.dns_backend rundate = parse.data.last_rundate @@ -82,14 +76,13 @@ o2 = s:option(ListValue, "adb_dns", translate("DNS Backend (DNS Directory)"), .. translate("To overwrite the default path use the 'DNS Directory' option in the extra section below.")) o2:value("dnsmasq", "dnsmasq (/tmp/dnsmasq.d)") o2:value("unbound", "unbound (/var/lib/unbound)") -o2:value("named", "bind (/var/lib/bind)") +o2:value("named", "named (/var/lib/bind)") o2:value("kresd", "kresd (/etc/kresd)") o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)") -o2.default = "dnsmasq" o2.rmempty = false o3 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), - translate("List of available network interfaces. By default the startup will be triggered by the 'wan' interface.<br />") + translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface.<br />") .. translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface.")) o3:value("none") o3:value("timed") @@ -149,7 +142,7 @@ else dv4.value = backend end -dv5 = s:option(DummyValue, "", translate("Overall Blocked Domains")) +dv5 = s:option(DummyValue, "", translate("Overall Domains")) dv5.template = "adblock/runtime" if parse == nil then dv5.value = translate("n/a") @@ -170,7 +163,7 @@ end bl = m:section(TypedSection, "source", translate("Blocklist Sources"), translate("Available blocklist sources. ") .. translate("List URLs and Shallalist category selections are configurable in the 'Advanced' section.<br />") - .. translate("Caution: Please don't select big lists or many lists at once on low memory devices to prevent OOM exceptions!")) + .. translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please do not select too many lists - 5-6 should be sufficient!")) bl.template = "cbi/tblsection" name = bl:option(Flag, "enabled", translate("Enabled")) @@ -185,12 +178,11 @@ function ssl.cfgvalue(self, section) return translate("No") end end - des = bl:option(DummyValue, "adb_src_desc", translate("Description")) -- Extra options -e = m:section(NamedSection, "global", "adblock", translate("Extra Options"), +e = m:section(NamedSection, "extra", "adblock", translate("Extra Options"), translate("Options for further tweaking in case the defaults are not suitable for you.")) e1 = e:option(Flag, "adb_debug", translate("Verbose Debug Logging"), @@ -204,34 +196,47 @@ e2.default = e2.disabled e2.rmempty = false e3 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"), - translate("Enable memory intense overall sort / duplicate removal on low memory devices (< 64 MB RAM)")) + translate("Enable memory intense overall sort / duplicate removal on low memory devices (< 64 MB free RAM)")) e3.default = e3.disabled e3.rmempty = false -e4 = e:option(Flag, "adb_manmode", translate("Manual / Backup mode"), - translate("Do not automatically update blocklists during startup, use blocklist backups instead.")) +e4 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"), + translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in backup mode.")) e4.default = e4.disabled e4.rmempty = false -e5 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"), - translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in manual mode.")) -e5.default = e5.disabled -e5.rmempty = false +e5 = e:option(Value, "adb_backupdir", translate("Backup Directory"), + translate("Target directory for adblock backups. Please use only non-volatile disks, e.g. an external usb stick.")) +e5:depends("adb_backup", 1) +e5.datatype = "directory" +e5.default = "/mnt" +e5.rmempty = true -e6 = e:option(Value, "adb_backupdir", translate("Backup Directory"), - translate("Target directory for adblock backups. Please use only non-volatile disks, no ram/tmpfs drives.")) -e6.datatype = "directory" -e6.default = "/mnt" -e6.rmempty = false +e6 = e:option(Flag, "adb_backup_mode", translate("Backup Mode"), + translate("Do not automatically update blocklists during startup, use blocklist backups instead.")) +e6:depends("adb_backup", 1) +e6.default = e6.disabled +e6.rmempty = true -e7 = e:option(Value, "adb_dnsdir", translate("DNS Directory"), +e7 = e:option(Flag, "adb_whitelist_mode", translate("Whitelist Mode"), + translate("Block access to all domains except those explicitly listed in the whitelist file.")) +e7.default = e7.disabled +e7.rmempty = true + +e8 = e:option(Value, "adb_dnsdir", translate("DNS Directory"), translate("Target directory for the generated blocklist 'adb_list.overall'.")) -e7.datatype = "directory" -e7.optional = true +e8.datatype = "directory" +e8.optional = true -e8 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"), +e9 = e:option(Value, "adb_whitelist", translate("Whitelist File"), + translate("Full path to the whitelist file.")) +e9.datatype = "file" +e9.default = "/etc/adblock/adblock.whitelist" +e9.optional = true + +e10 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"), translate("Additional trigger delay in seconds before adblock processing begins.")) -e8.datatype = "range(1,60)" -e8.optional = true +e10.datatype = "range(1,60)" +e10.optional = true return m diff --git a/applications/luci-app-adblock/luasrc/view/adblock/config_css.htm b/applications/luci-app-adblock/luasrc/view/adblock/config_css.htm index 53493a18fb..2233a15e31 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/config_css.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/config_css.htm @@ -6,5 +6,8 @@ font-size: 12px; font-family: monospace; resize: none; + white-space: pre; + overflow-wrap: normal; + overflow-x: scroll; } </style> |