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

luci-app-adblock: match adblock 1.1.0

Browse source 
Update the luci app to match adblock 1.1.0
Add support for showing blocklist status info.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b45520011f)
This commit is contained in:
Hannu Nyman 2016-05-01 02:55:45 +03:00
parent 11d5867a45
commit 234ca580c7
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,11 +12,6 @@ o1 = s:option(Flag, "adb_enabled", translate("Enable adblock"))
o1.rmempty = false o1.rmempty = false
o1.default = 0 o1.default = 0
o2 = s:option(Value, "adb_blacklist", translate("Blacklist file"),
translate("File with explicitly blacklisted hosts/domains."))
o2.rmempty = false
o2.datatype = "file"
o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"), o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"),
translate("File with whitelisted hosts/domains that are allowed despite being on a blocklist.")) translate("File with whitelisted hosts/domains that are allowed despite being on a blocklist."))
o3.rmempty = false o3.rmempty = false
@ -28,6 +23,8 @@ fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the
fdns.rmempty = false fdns.rmempty = false
fdns.default = fdns.enabled fdns.default = fdns.enabled
tot = s:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains"))
-- Blocklist options -- Blocklist options
bl = m:section(TypedSection, "source", translate("Blocklist sources"), bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@ -41,8 +38,9 @@ bl.template = "cbi/tblsection"
name = bl:option(Flag, "enabled", translate("Enabled")) name = bl:option(Flag, "enabled", translate("Enabled"))
name.rmempty = false name.rmempty = false
des = bl:option(DummyValue, "adb_srcdesc", translate("Description")) des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
des.rmempty = false cou = bl:option(DummyValue, "adb_src_count", translate("Count"))
upd = bl:option(DummyValue, "adb_src_timestamp", translate("List date/state"))
-- Additional options -- Additional options
@ -52,7 +50,7 @@ o4 = s2:option(Flag, "enabled", translate("Enable blocklist backup"))
o4.rmempty = false o4.rmempty = false
o4.default = 0 o4.default = 0
o5 = s2:option(Value, "adb_backupdir", translate("Backup directory")) o5 = s2:option(Value, "adb_dir", translate("Backup directory"))
o5.rmempty = false o5.rmempty = false
o5.datatype = "directory" o5.datatype = "directory"
@ -76,11 +74,6 @@ a3.optional = true
a3.default = "::ffff:c000:0201" a3.default = "::ffff:c000:0201"
a3.datatype = "ip6addr" a3.datatype = "ip6addr"
a6 = e:option(Value, "adb_wanif", translate("Name of the logical wan interface"))
a6.optional = true
a6.default = "wan"
a6.datatype = "network"
a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface")) a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
a7.optional = true a7.optional = true
a7.default = "lan" a7.default = "lan"