X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock.lua;h=2cee3020863f00f3ccb0277f4d55eba82ce0c85f;hp=7d681b22d15203e0f257662d770b2ad4d5468674;hb=a3fc4859dd0d3e9e9fa87ca249b815a4710ed7bd;hpb=6ee5c593b3599af3696d3a1eb3440137f863a378

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 7d681b22d..2cee30208 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -12,21 +12,30 @@ o1 = s:option(Flag, "adb_enabled", translate("Enable adblock"))
 o1.rmempty = false
 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"),
      translate("File with whitelisted hosts/domains that are allowed despite being on a blocklist."))
 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"),
 	translate("Available blocklist sources (")
-	.. [[<a href="https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md#main-features" target="_blank">]]
+	.. [[<a href="https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md" target="_blank">]]
 	.. translate("see list details")
 	.. [[</a>]]
 	.. translate("). Note that list URLs and Shallalist category selections are not configurable via Luci."))
@@ -35,6 +44,10 @@ bl.template = "cbi/tblsection"
 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
 
 s2 = m:section(NamedSection, "backup", "service", translate("Backup options"))
@@ -43,64 +56,46 @@ o4 = s2:option(Flag, "enabled", translate("Enable blocklist backup"))
 o4.rmempty = false
 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.datatype = "directory"
 
-s3 = m:section(NamedSection, "debuglog", "service", translate("Debug log options"))
-
-o6 = s3:option(Flag, "enabled", translate("Enable debug log"))
-o6.rmempty = false
-o6.default = 0
-
-o7 = s3:option(Value, "adb_logfile", translate("Debug log file"))
-o7.rmempty = false
-o7.datatype = "string"
-
 -- Extra options
 
 e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
 	translate("Options for further tweaking in case the defaults are not suitable for you."))
 
-a1 = e:option(Value, "adb_port", translate("Port of the adblock uhttpd instance"))
+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
+
+a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance"))
 a1.optional = true
-a1.rmempty = true
-a1.default = 65535
+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.rmempty = true
-a2.default = "192.0.2.1"
+a2.default = "198.18.0.1"
 a2.datatype = "ip4addr"
 
 a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address"))
 a3.optional = true
-a3.rmempty = true
-a3.default = "::ffff:c000:0201"
+a3.default = "::ffff:c612:0001"
 a3.datatype = "ip6addr"
 
-a4 = e:option(Value, "adb_maxtime", translate("Download timeout limit in seconds"))
+a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)"))
 a4.optional = true
-a4.rmempty = true
-a4.default = 60
-a4.datatype = "uinteger"
-
-a5 = e:option(Value, "adb_maxloop", translate("Timeout limit for active wan lookup at startup"))
-a5.optional = true
-a5.rmempty = true
-a5.default = 20
-a5.datatype = "uinteger"
-
-a6 = e:option(Value, "adb_wanif", translate("Name of the logical wan interface") )
-a6.optional = true
-a6.rmempty = true
-a6.default = "wan"
-a6.datatype = "network"
+a4.default = 5
+a4.datatype = "range(2,60)"
 
-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.rmempty = true
 a7.default = "lan"
 a7.datatype = "network"