From 0f18b873d893a30564a2684e0dcc7f4fb68ed296 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 28 Mar 2020 14:35:10 +0100 Subject: luci-app-adblock: release 4.0.0 * complete rewrite, migrated to client side JS * tested with mainline 19.07 and current master * tested with latest Firefox & Chrome and all standard themes (not OpenWrt2020!) Pre-tested by many forum users, see here: https://forum.openwrt.org/t/adblock-4-pre-releases/57101 * sync translations Signed-off-by: Dirk Brenken --- .../luci-app-adblock/luasrc/controller/adblock.lua | 177 +----------- .../luasrc/model/cbi/adblock/blacklist_tab.lua | 55 ---- .../luasrc/model/cbi/adblock/configuration_tab.lua | 52 ---- .../luasrc/model/cbi/adblock/overview_tab.lua | 267 ------------------ .../luasrc/model/cbi/adblock/whitelist_tab.lua | 55 ---- .../luasrc/view/adblock/adblock_css.htm | 86 ------ .../luasrc/view/adblock/blocklist.htm | 47 ---- .../luasrc/view/adblock/logread.htm | 36 --- .../luci-app-adblock/luasrc/view/adblock/query.htm | 64 ----- .../luasrc/view/adblock/report.htm | 310 --------------------- .../luasrc/view/adblock/runtime.htm | 213 -------------- 11 files changed, 7 insertions(+), 1355 deletions(-) delete mode 100644 applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua delete mode 100644 applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua delete mode 100644 applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua delete mode 100644 applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/adblock_css.htm delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/logread.htm delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/query.htm delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/report.htm delete mode 100644 applications/luci-app-adblock/luasrc/view/adblock/runtime.htm (limited to 'applications/luci-app-adblock/luasrc') diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index bee1d1439..11a4abb9f 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -1,175 +1,12 @@ --- Copyright 2017-2019 Dirk Brenken (dev@brenken.org) --- This is free software, licensed under the Apache License, Version 2.0 +-- stub lua controller for 19.07 backward compatibility module("luci.controller.adblock", package.seeall) -local sys = require("luci.sys") -local util = require("luci.util") -local http = require("luci.http") -local i18n = require("luci.i18n") -local json = require("luci.jsonc") -local uci = require("luci.model.uci").cursor() - function index() - if not nixio.fs.access("/etc/config/adblock") then - return - end - entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 30).dependent = false - entry({"admin", "services", "adblock", "tab_from_cbi"}, cbi("adblock/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true - if nixio.fs.access("/usr/sbin/tcpdump") then - entry({"admin", "services", "adblock", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true - end - entry({"admin", "services", "adblock", "log"}, template("adblock/logread"), _("Logfile"), 30).leaf = true - entry({"admin", "services", "adblock", "advanced"}, firstchild(), _("Advanced"), 100) - entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true - entry({"admin", "services", "adblock", "advanced", "whitelist"}, form("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true - entry({"admin", "services", "adblock", "advanced", "configuration"}, form("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true - entry({"admin", "services", "adblock", "advanced", "query"}, template("adblock/query"), _("Query domains"), 140).leaf = true - entry({"admin", "services", "adblock", "advanced", "result"}, call("queryData"), nil, 150).leaf = true - entry({"admin", "services", "adblock", "logread"}, call("logread"), nil).leaf = true - entry({"admin", "services", "adblock", "status_update"}, call("status_update"), nil).leaf = true - entry({"admin", "services", "adblock", "report_json"}, call("report_json"), nil).leaf = true - entry({"admin", "services", "adblock", "report_text"}, call("report_text"), nil).leaf = true - entry({"admin", "services", "adblock", "action"}, call("adb_action"), nil).leaf = true -end - -function adb_action(name, ...) - local domain = select(1, ...) or "" - local search = select(2, ...) or "+" - local count = select(3, ...) or "50" - local filter = select(4, ...) or "false" - local print = select(5, ...) or "false" - - local report_params = { - search, - count, - filter, - print - } - - if name == "do_suspend" then - luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1") - elseif name == "do_resume" then - luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1") - elseif name == "do_refresh" then - luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1") - elseif name == "do_report" then - luci.sys.call("/etc/init.d/adblock report " ..table.concat(report_params, " ").. " >/dev/null 2>&1") - local rep_dir = uci:get("adblock", "extra", "adb_repdir") or "/tmp" - repeat - nixio.nanosleep(1) - until not nixio.fs.access(rep_dir.. "/adb_report.raw") - elseif name == "do_filter" then - luci.sys.call("/etc/init.d/adblock report " ..table.concat(report_params, " ").. " >/dev/null 2>&1") - local rep_dir = uci:get("adblock", "extra", "adb_repdir") or "/tmp" - repeat - nixio.nanosleep(1) - until nixio.fs.access(rep_dir.. "/adb_report.final") - elseif name == "add_blacklist" then - local file = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist" - if nixio.fs.access(file) then - local blacklist = nixio.fs.readfile(file) - if not string.find(blacklist, domain, 1, true) - then - nixio.fs.writefile(file, blacklist.. domain.. "\n") - end - end - elseif name == "add_whitelist" then - local file = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" - if nixio.fs.access(file) then - local whitelist = nixio.fs.readfile(file) - if not string.find(whitelist, domain, 1, true) - then - nixio.fs.writefile(file, whitelist.. domain.. "\n") - end - end - end - if name == "do_suspend" or name == "do_resume" or name == "do_refresh" then - local pid_file = "/var/run/adblock.pid" - if nixio.fs.access(pid_file) then - repeat - nixio.nanosleep(1) - until nixio.fs.readfile(pid_file) == "" - end - end - luci.http.prepare_content("text/plain") - luci.http.write("0") -end - -function status_update() - local rt_file - local content - - rt_file = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" - - if nixio.fs.access(rt_file) then - content = json.parse(nixio.fs.readfile(rt_file) or "") - http.prepare_content("application/json") - http.write_json(content) - end -end - -function report_json() - local rep_dir - local rep_file - local content - - rep_dir = uci:get("adblock", "extra", "adb_repdir") or "/tmp" - rep_file = rep_dir.. "/adb_report.json" - http.prepare_content("application/json") - - if nixio.fs.access(rep_file) then - content = json.parse(nixio.fs.readfile(rep_file) or "") - http.write_json(content) - else - http.write_json("{}") - end -end - -function report_text() - local file - local rep_dir - local rep_file - local content - - rep_dir = uci:get("adblock", "extra", "adb_repdir") or "/tmp" - rep_file = rep_dir.. "/adb_report.final" - http.prepare_content("text/plain") - - if nixio.fs.access(rep_file) then - file = io.open(rep_file, "r") - content = file:read("*all") - file:close() - http.write(content) - else - http.write("") - end -end - -function logread() - local content = util.trim(util.exec("logread -e 'adblock-'")) or "" - - if content == "" then - content = "No adblock related logs yet!" - end - http.write(content) -end - -function queryData(domain) - if domain then - luci.http.prepare_content("text/plain") - local cmd = "/etc/init.d/adblock query %s 2>&1" - local util = io.popen(cmd % util.shellquote(domain)) - if util then - while true do - local line = util:read("*l") - if not line then - break - end - luci.http.write(line) - luci.http.write("\n") - end - util:close() - end - end + entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 60) + entry({"admin", "services", "adblock", "overview"}, view("adblock/overview"), _("Overview"), 10) + entry({"admin", "services", "adblock", "dnsreport"}, view("adblock/dnsreport"), _("DNS Report"), 20) + entry({"admin", "services", "adblock", "blacklist"}, view("adblock/blacklist"), _("Edit Blacklist"), 30) + entry({"admin", "services", "adblock", "whitelist"}, view("adblock/whitelist"), _("Edit Whitelist"), 40) + entry({"admin", "services", "adblock", "logread"}, view("adblock/logread"), _("Log View"), 50) end diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua deleted file mode 100644 index 4d1a9f7e6..000000000 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua +++ /dev/null @@ -1,55 +0,0 @@ --- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) --- This is free software, licensed under the Apache License, Version 2.0 - -local fs = require("nixio.fs") -local util = require("luci.util") -local uci = require("luci.model.uci").cursor() -local input = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist" - -if not fs.access(input) then - m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) - m.reset = false - m.submit = false - return m -end - -if fs.stat(input).size >= 102400 then - m = SimpleForm("error", nil, - translate("The file size is too large for online editing in LuCI (≥ 100 KB). ") - .. translate("Please edit this file directly in a terminal session.")) - m.reset = false - m.submit = false - return m -end - -m = SimpleForm("input", nil) -m:append(Template("adblock/adblock_css")) -m.submit = translate("Save") -m.reset = false - -s = m:section(SimpleSection, nil, - translatef("This form allows you to modify the content of the adblock blacklist (%s). ", input) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) - -f = s:option(TextValue, "data") -f.datatype = "string" -f.rows = 20 -f.rmempty = true - -function f.cfgvalue() - return fs.readfile(input) or "" -end - -function f.write(self, section, data) - return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") -end - -function f.remove(self, section, value) - return fs.writefile(input, "") -end - -function s.handle(self, state, data) - return true -end - -return m diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua deleted file mode 100644 index 1e7eda903..000000000 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua +++ /dev/null @@ -1,52 +0,0 @@ --- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) --- This is free software, licensed under the Apache License, Version 2.0 - -local fs = require("nixio.fs") -local util = require("luci.util") -local input = "/etc/config/adblock" - -if not fs.access(input) then - m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) - m.reset = false - m.submit = false - return m -end - -if fs.stat(input).size >= 102400 then - m = SimpleForm("error", nil, - translate("The file size is too large for online editing in LuCI (≥ 100 KB). ") - .. translate("Please edit this file directly in a terminal session.")) - m.reset = false - m.submit = false - return m -end - -m = SimpleForm("input", nil) -m:append(Template("adblock/adblock_css")) -m.submit = translate("Save") -m.reset = false - -s = m:section(SimpleSection, nil, - translate("This form allows you to modify the content of the main adblock configuration file (/etc/config/adblock).")) - -f = s:option(TextValue, "data") -f.rows = 20 -f.rmempty = true - -function f.cfgvalue() - return fs.readfile(input) or "" -end - -function f.write(self, section, data) - return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") -end - -function f.remove(self, section, value) - return fs.writefile(input, "") -end - -function s.handle(self, state, data) - return true -end - -return m 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 deleted file mode 100644 index edef8a049..000000000 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ /dev/null @@ -1,267 +0,0 @@ --- Copyright 2017-2019 Dirk Brenken (dev@brenken.org) --- This is free software, licensed under the Apache License, Version 2.0 - -local fs = require("nixio.fs") -local uci = require("luci.model.uci").cursor() -local util = require("luci.util") -local net = require "luci.model.network".init() -local dump = util.ubus("network.interface", "dump", {}) - -m = Map("adblock", translate("Adblock"), - translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ") - ..translatef("For further information " - .. "" - .. "check the online documentation", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md")) - --- Main adblock options - -s = m:section(NamedSection, "global", "adblock") - -o1 = s:option(Flag, "adb_enabled", translate("Enable Adblock")) -o1.default = o1.disabled -o1.rmempty = false - -o2 = s:option(ListValue, "adb_dns", translate("DNS Backend (DNS Directory)"), - translate("List of supported DNS backends with their default list export directory. ") - ..translate("To overwrite the default path use the 'DNS Directory' option in the extra section below.")) -o2:value("dnsmasq", "dnsmasq (/tmp)") -o2:value("unbound", "unbound (/var/lib/unbound)") -o2:value("named", "named (/var/lib/bind)") -o2:value("kresd", "kresd (/etc/kresd)") -o2.default = "dnsmasq (/tmp)" -o2.rmempty = false - -o3 = s:option(ListValue, "adb_dnsvariant", translate("DNS Blocking Variant"), - translate("List of supported DNS blocking variants. By default 'nxdomain' will be used for all DNS backends. ") - ..translate("Dnsmasq also supports 'null' block variants, which may provide better response times.")) -o3:value("nxdomain", "nxdomain, all DNS backends") -o3:value("null (IPv4)", "null (IPv4), dnsmasq only") -o3:value("null (IPv4/IPv6)", "null (IPv4/IPv6), dnsmasq only") -o3.default = "nxdomain, all DNS backends" -o3.rmempty = false - -o4 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"), - translate("List of supported and fully pre-configured download utilities.")) -o4:value("uclient-fetch") -o4:value("wget") -o4:value("curl") -o4:value("aria2c") -o4:value("wget-nossl", "wget-nossl (noSSL)") -o4:value("busybox", "wget-busybox (noSSL)") -o4.default = "uclient-fetch" -o4.rmempty = false - -o5 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), - translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface. ") - ..translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface.")) -o5:value("none") -o5:value("timed") -if dump then - local i, v - for i, v in ipairs(dump.interface) do - if v.interface ~= "loopback" then - local device = v.l3_device or v.device or "-" - o5:value(v.interface, v.interface.. " (" ..device.. ")") - end - end -end -o5.rmempty = false - --- Runtime information - -ds = s:option(DummyValue, "_dummy") -ds.template = "adblock/runtime" - --- Blocklist table - -bl = m:section(TypedSection, "source", translate("Blocklist Sources"), - translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please only select a few of them!")) -bl.template = "adblock/blocklist" - -name = bl:option(Flag, "enabled", translate("Enabled")) -name.rmempty = false - -ssl = bl:option(DummyValue, "adb_src", translate("SSL req.")) -function ssl.cfgvalue(self, section) - local source = self.map:get(section, "adb_src") - if source and source:match("https://") then - return translate("Yes") - else - return translate("No") - end -end - -des = bl:option(DummyValue, "adb_src_desc", translate("Description")) - -cat = bl:option(DynamicList, "adb_src_cat", translate("Archive Categories")) -cat.datatype = "uciname" -cat.optional = true - --- 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"), - translate("Enable verbose debug logging in case of any processing error.")) -e1.rmempty = false - -e2 = e:option(Flag, "adb_nice", translate("Low Priority Service"), - translate("Set the nice level to 'low priority' and the adblock background processing will take fewer resources from the system. ") - ..translate("This change requires a manual service stop/re-start to take effect.")) -e2.disabled = "0" -e2.enabled = "10" -e2.rmempty = false - -e3 = e:option(Flag, "adb_forcedns", translate("Force Local DNS"), - translate("Redirect all DNS queries from 'lan' zone to the local resolver, applies to UDP and TCP protocol on port 53, 853 and 5353.")) -e3.rmempty = false - -e4 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"), - translate("Size of the download queue to handle downloads & list processing in parallel (default '4'). ") - ..translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe.")) -e4.default = 4 -e4.datatype = "range(1,32)" -e4.rmempty = false - -e5 = e:option(Flag, "adb_dnsfilereset", translate("DNS File Reset"), - translate("Resets the final DNS blockfile 'adb_list.overall' after loading through the DNS backend. ") - ..translate("This option saves an enormous amount of storage space, but starts a small ubus/adblock monitor in the background.")) -e5.disabled = "false" -e5.enabled = "true" -e5.rmempty = false - -e6 = e:option(Flag, "adb_report", translate("DNS Query Report"), - translate("Gather DNS related network traffic via tcpdump to provide a DNS Query Report on demand. ") - ..translate("Please note: this needs manual 'tcpdump-mini' package installation.")) -e6.rmempty = false - -e7 = e:option(Value, "adb_repdir", translate("Report Directory"), - translate("Target directory for dns related report files. Default is '/tmp', please use preferably a non-volatile disk if available.")) -e7:depends("adb_report", 1) -e7.datatype = "directory" -e7.default = "/tmp" -e7.rmempty = true - -e8 = e:option(Value, "adb_backupdir", translate("Backup Directory"), - translate("Target directory for adblock source backups. Default is '/tmp', please use preferably a non-volatile disk if available.")) -e8.datatype = "directory" -e8.default = "/tmp" -e8.rmempty = true - -e9 = e:option(Flag, "adb_mail", translate("E-Mail Notification"), - translate("Send notification e-mails in case of a processing error or if domain count is ≤ 0. ") - .. translate("Please note: this needs manual 'msmtp' package installation and setup.")) -e9.rmempty = true - -e10 = e:option(Value, "adb_mreceiver", translate("E-Mail Receiver Address"), - translate("Receiver address for adblock notification e-mails.")) -e10:depends("adb_mail", 1) -e10.rmempty = true - --- Optional Extra Options - -e20 = e:option(Value, "adb_dnsdir", translate("DNS Directory"), - translate("Target directory for the generated blocklist 'adb_list.overall'.")) -e20.datatype = "directory" -e20.optional = true - -e21 = e:option(Value, "adb_blacklist", translate("Blacklist File"), - translate("Full path to the blacklist file.")) -e21.datatype = "file" -e21.default = "/etc/adblock/adblock.blacklist" -e21.optional = true - -e22 = e:option(Value, "adb_whitelist", translate("Whitelist File"), - translate("Full path to the whitelist file.")) -e22.datatype = "file" -e22.default = "/etc/adblock/adblock.whitelist" -e22.optional = true - -e23 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"), - translate("Additional trigger delay in seconds before adblock processing begins.")) -e23.datatype = "range(1,60)" -e23.optional = true - -e24 = e:option(Value, "adb_maxtld", translate("TLD Compression Threshold"), - translate("Disable the toplevel domain compression, if the number of blocked domains is greater than this threshold.")) -e24.datatype = "min(0)" -e24.default = 100000 -e24.optional = true - -e25 = e:option(Value, "adb_portlist", translate("Local FW/DNS Ports"), - translate("Space separated list of firewall ports which should be redirected locally.")) -e25.default = "53 853 5353" -e25.optional = true - -e26 = e:option(Flag, "adb_dnsinotify", translate("DNS Inotify"), - translate("Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends with autoload features.")) -e26.default = nil -e26.enabled = "true" -e26.optional = true - -e27 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"), - translate("Flush DNS cache after adblock processing.")) -e27.default = nil -e27.optional = true - -e28 = e:option(ListValue, "adb_repiface", translate("Report Interface"), - translate("Reporting interface used by tcpdump, set to 'any' for multiple interfaces (default 'br-lan'). ") - ..translate("This change requires a manual service stop/re-start to take effect.")) -if dump then - local i, v - for i, v in ipairs(dump.interface) do - if v.interface ~= "loopback" then - local device = v.device - if device then - e28:value(device) - end - end - end -end -e28:value("any") -e28.optional = true - -e29 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"), - translate("Space separated list of reporting port(s) used by tcpdump (default: '53'). ") - ..translate("This change requires a manual service stop/re-start to take effect.")) -e29.default = 53 -e29.optional = true - -e30 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"), - translate("Report chunk count used by tcpdump (default '5'). ") - ..translate("This change requires a manual service stop/re-start to take effect.")) -e30.datatype = "range(1,10)" -e30.default = 5 -e30.optional = true - -e31 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"), - translate("Report chunk size used by tcpdump in MB (default '1'). ") - ..translate("This change requires a manual service stop/re-start to take effect.")) -e31.datatype = "range(1,10)" -e31.default = 1 -e31.optional = true - -e32 = e:option(Value, "adb_msender", translate("E-mail Sender Address"), - translate("Sender address for adblock notification e-mails.")) -e32.default = "no-reply@adblock" -e32.optional = true - -e33 = e:option(Value, "adb_mtopic", translate("E-mail Topic"), - translate("Topic for adblock notification e-mails.")) -e33.default = "adblock notification" -e33.optional = true - -e34 = e:option(Value, "adb_mprofile", translate("E-mail Profile"), - translate("Mail profile used in 'msmtp' for adblock notification e-mails.")) -e34.default = "adb_notify" -e34.optional = true - -e35 = e:option(Value, "adb_mcnt", translate("E-mail Notification Count"), - translate("Raise the minimum notification count, to get e-mails if the overall count is less or equal to the given limit (default 0), ") - .. translate("e.g. to receive an e-mail notification with every adblock run set this value to 200000.")) -e35.default = 0 -e35.datatype = "min(0)" -e35.optional = true - -return m diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua deleted file mode 100644 index 03dcecf1a..000000000 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ /dev/null @@ -1,55 +0,0 @@ --- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) --- This is free software, licensed under the Apache License, Version 2.0 - -local fs = require("nixio.fs") -local util = require("luci.util") -local uci = require("luci.model.uci").cursor() -local input = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" - -if not fs.access(input) then - m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) - m.reset = false - m.submit = false - return m -end - -if fs.stat(input).size >= 102400 then - m = SimpleForm("error", nil, - translate("The file size is too large for online editing in LuCI (≥ 100 KB). ") - .. translate("Please edit this file directly in a terminal session.")) - m.reset = false - m.submit = false - return m -end - -m = SimpleForm("input", nil) -m:append(Template("adblock/adblock_css")) -m.submit = translate("Save") -m.reset = false - -s = m:section(SimpleSection, nil, - translatef("This form allows you to modify the content of the adblock whitelist (%s). ", input) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) - -f = s:option(TextValue, "data") -f.datatype = "string" -f.rows = 20 -f.rmempty = true - -function f.cfgvalue() - return fs.readfile(input) or "" -end - -function f.write(self, section, data) - return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") -end - -function f.remove(self, section, value) - return fs.writefile(input, "") -end - -function s.handle(self, state, data) - return true -end - -return m diff --git a/applications/luci-app-adblock/luasrc/view/adblock/adblock_css.htm b/applications/luci-app-adblock/luasrc/view/adblock/adblock_css.htm deleted file mode 100644 index 5467c8763..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/adblock_css.htm +++ /dev/null @@ -1,86 +0,0 @@ - diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm deleted file mode 100644 index c90afe768..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm +++ /dev/null @@ -1,47 +0,0 @@ -<%# -Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%- -local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous" --%> - -<%+adblock/adblock_css%> - -
- <% if self.title then -%> -

<%=self.title%>

- <%- end %> -
<%=self.description%>
-
-
-
- <%- for i, k in pairs(self.children) do -%> -
- <%-=k.title-%> -
- <%- end -%> -
- <%- local section, scope, isempty = true - for i, k in ipairs(self:cfgsections()) do - section = k - local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k) - local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname, true) - isempty = false - scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } - -%> -
> - <%- - for k, node in ipairs(self.children) do - node:render(section, scope or {}) - end - if not scope.cbid:match("adb_src_cat") then - -%> -
 
- <%- end -%> -
- <%- end -%> -
-
-
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm deleted file mode 100644 index 48e367ec2..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm +++ /dev/null @@ -1,36 +0,0 @@ -<%# -Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+header%> -<%+adblock/adblock_css%> - - - -
-
-
<%:The syslog output, pre-filtered for adblock related messages only.%>
- -
-
- -<%+footer%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm deleted file mode 100644 index fb659958d..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ /dev/null @@ -1,64 +0,0 @@ -<%# -Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+header%> - - - -
-
-
-
<%:This form allows you to query active block lists for certain domains, e.g. for whitelisting.%>
-
- - -
-
-
-
-
- -
- -<%+footer%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/report.htm b/applications/luci-app-adblock/luasrc/view/adblock/report.htm deleted file mode 100644 index 814cc2fb2..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/report.htm +++ /dev/null @@ -1,310 +0,0 @@ -<%# -Copyright 2017-2019 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+header%> -<%+adblock/adblock_css%> - - - -
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- - -
-
-
-
-

<%:Top 10 Reporting%>

-
-
-
-
-
<%:Filter the DNS Query result set for a particular domain, client or time frame.%>
-
- - - - -
-
-
-

<%:Latest DNS Queries%>

-
-
-<%+footer%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm deleted file mode 100644 index 2cec57334..000000000 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ /dev/null @@ -1,213 +0,0 @@ -<%# -Copyright 2017-2019 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+adblock/adblock_css%> - - -

<%:Runtime Information%>

-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
- - -
-
-

-

- -
- - -
-
-- cgit v1.2.3