Merge pull request #656 from nlhintz/pull-request

[project/luci.git] / applications / luci-app-adblock / luasrc / model / cbi / adblock.lua

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 2603617..2cee302 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -12,11 +12,6 @@ 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
@@ -28,6 +23,14 @@ fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the
 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"),
@@ -41,8 +44,9 @@ bl.template = "cbi/tblsection"
 name = bl:option(Flag, "enabled", translate("Enabled"))
 name.rmempty  = false
 
-des = bl:option(DummyValue, "adb_srcdesc", translate("Description"))
-des.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
 
@@ -52,7 +56,7 @@ 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"
 
@@ -61,25 +65,34 @@ 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."))
 
-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.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.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.default = "::ffff:c000:0201"
+a3.default = "::ffff:c612:0001"
 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"
+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