From 234ca580c74458ff4af1115b184ce45d6ae37e52 Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 1 May 2016 02:55:45 +0300
Subject: [PATCH] luci-app-adblock: match adblock 1.1.0
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 b45520011f93aec197ec195aa4af59028204c7d0)
---
.../luasrc/model/cbi/adblock.lua | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 260361734..d0f5ecc5b 100644
--- 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,8 @@ fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the
fdns.rmempty = false
fdns.default = fdns.enabled
+tot = s:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains"))
+
-- Blocklist options
bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@@ -41,8 +38,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 +50,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"
@@ -76,11 +74,6 @@ a3.optional = true
a3.default = "::ffff:c000:0201"
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.optional = true
a7.default = "lan"
--
2.25.1