Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-adblock: sync with adblock 2.8.5

Browse source 
* add preliminary kresd support
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-08-04 08:34:34 +02:00
parent f450c0403d
commit 0f13f7eb81
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-app-adblock/luasrc/controller/adblock.lua
View file

@ -5,7 +5,7 @@ module("luci.controller.adblock", package.seeall)
local fs = require("nixio.fs") local fs = require("nixio.fs")
local util = require("luci.util") local util = require("luci.util")
local template = require("luci.template") local templ = require("luci.template")
local i18n = require("luci.i18n") local i18n = require("luci.i18n")
function index() function index()
@ -19,17 +19,13 @@ function index()
entry({"admin", "services", "adblock", "advanced", "blacklist"}, cbi("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true entry({"admin", "services", "adblock", "advanced", "blacklist"}, cbi("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
entry({"admin", "services", "adblock", "advanced", "whitelist"}, cbi("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true entry({"admin", "services", "adblock", "advanced", "whitelist"}, cbi("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true
entry({"admin", "services", "adblock", "advanced", "configuration"}, cbi("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true entry({"admin", "services", "adblock", "advanced", "configuration"}, cbi("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true
entry({"admin", "services", "adblock", "advanced", "query"}, call("query"), _("Query domains"), 140).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", "advanced", "result"}, call("queryData"), nil, 150).leaf = true
end end
function logread() function logread()
local logfile = util.trim(util.exec("logread -e 'adblock'")) local logfile = util.trim(util.exec("logread -e 'adblock'"))
template.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile}) templ.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile})
end
function query()
template.render("adblock/query", {title = i18n.translate("Adblock Domain Query")})
end end
function queryData(domain) function queryData(domain)

1
applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
View file

@ -25,6 +25,7 @@ end
m = SimpleForm("input", nil) m = SimpleForm("input", nil)
m:append(Template("adblock/config_css")) m:append(Template("adblock/config_css"))
m.submit = translate("Save")
m.reset = false m.reset = false
s = m:section(SimpleSection, nil, s = m:section(SimpleSection, nil,

1
applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
View file

@ -14,6 +14,7 @@ end
m = SimpleForm("input", nil) m = SimpleForm("input", nil)
m:append(Template("adblock/config_css")) m:append(Template("adblock/config_css"))
m.submit = translate("Save")
m.reset = false m.reset = false
s = m:section(SimpleSection, nil, s = m:section(SimpleSection, nil,

4
applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
View file

@ -21,6 +21,8 @@ if parse ~= nil then
dnspath = "/var/lib/unbound" dnspath = "/var/lib/unbound"
elseif backend == "named" then elseif backend == "named" then
dnspath = "/var/lib/bind" dnspath = "/var/lib/bind"
elseif backend == "kresd" then
dnspath = "/tmp/kresd"
end end
end end
end end
@ -180,7 +182,7 @@ e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
e2.default = e2.disabled e2.default = e2.disabled
e2.rmempty = false e2.rmempty = false
e3 = e:option(Flag, "adb_manmode", translate("Manual mode"), e3 = e:option(Flag, "adb_manmode", translate("Manual / Backup mode"),
translate("Do not automatically update blocklists during startup, use blocklist backups instead.")) translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
e3.default = e3.disabled e3.default = e3.disabled
e3.rmempty = false e3.rmempty = false

1
applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
View file

@ -24,6 +24,7 @@ end
m = SimpleForm("input", nil) m = SimpleForm("input", nil)
m:append(Template("adblock/config_css")) m:append(Template("adblock/config_css"))
m.submit = translate("Save")
m.reset = false m.reset = false
s = m:section(SimpleSection, nil, s = m:section(SimpleSection, nil,