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

luci-app-adblock: Adjust to adblock 2.0

Browse source 
Modify the LuCI app to match the simplified adblock 2.0

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2016-12-20 13:44:11 +02:00
parent 1741e5578c
commit 0f0d036d02
1 changed files with 9 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
-- Copyright 2016 Openwrt.org
-- Copyright 2016 Hannu Nyman
-- Licensed to the public under the Apache License 2.0.
m = Map("adblock", translate("Adblock"),
@ -17,20 +17,6 @@ o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"),
o3.rmempty = false
o3.datatype = "file"
fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the local resolver"),
translate("When adblock is active, all DNS queries are redirected to the local resolver " ..
"in this server by default. You can disable that to allow queries to external DNS servers."))
fdns.rmempty = false
fdns.default = fdns.enabled
-- Statistics
t = m:section(NamedSection, "global", "adblock", translate("Statistics"))
dat = t:option(DummyValue, "adb_lastrun", translate("Last update of the blocklists"))
tot = t:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains"))
prc = t:option(DummyValue, "adb_percentage", translate("Percentage of blocked packets (before last update, IPv4/IPv6)"))
-- Blocklist options
bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@ -45,8 +31,6 @@ name = bl:option(Flag, "enabled", translate("Enabled"))
name.rmempty = false
des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
cou = bl:option(DummyValue, "adb_src_count", translate("Count"))
upd = bl:option(DummyValue, "adb_src_timestamp", translate("List date/state"))
-- Additional options
@ -65,39 +49,15 @@ o5.datatype = "directory"
e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
translate("Options for further tweaking in case the defaults are not suitable for you."))
a0 = e:option(Flag, "adb_restricted", translate("Do not write status info to flash"),
translate("Skip writing update status information to the config file. Status fields on this page will not be updated."))
a0.default = 0
a = e:option(Flag, "adb_debug", translate("Enable verbose debug logging"))
a.default = a.disabled
a.rmempty = false
a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance"))
a1.optional = true
a1.default = 65534
a1.datatype = "port"
a5 = e:option(Value, "adb_nullportssl", translate("Port of the adblock uhttpd instance for https links"))
a5.optional = true
a5.default = 65535
a5.datatype = "port"
a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address"))
a2.optional = true
a2.default = "198.18.0.1"
a2.datatype = "ip4addr"
a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address"))
a3.optional = true
a3.default = "::ffff:c612:0001"
a3.datatype = "ip6addr"
a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)"))
a4.optional = true
a4.default = 5
a4.datatype = "range(2,60)"
a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
a7.optional = true
a7.default = "lan"
a7.datatype = "network"
a = e:option(Value, "adb_iface", translate("Restrict reload trigger to certain interface(s)"),
translate("Space separated list of wan interfaces that trigger reload action. " ..
"To disable reload trigger set it to 'false'. Default: empty"))
a.datatype = "network"
a.rmempty = true
return m