From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 21 Feb 2016 15:39:19 +0000 (+0200)
Subject: luci-app-adblock: conform to adblock 0.80
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=e270083cfe32cabade4de9fb12c1c138026f290e;ds=inline

luci-app-adblock: conform to adblock 0.80

* Change "debug log" to "log"
* Add support for source descriptions
* Support new options for ping targets
* Simplify link to readme

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 7d681b22d..9ad4be463 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -26,7 +26,7 @@ o3.datatype = "file"
 
 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 +35,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
+
 -- Additional options
 
 s2 = m:section(NamedSection, "backup", "service", translate("Backup options"))
@@ -47,13 +50,13 @@ o5 = s2:option(Value, "adb_backupdir", translate("Backup directory"))
 o5.rmempty = false
 o5.datatype = "directory"
 
-s3 = m:section(NamedSection, "debuglog", "service", translate("Debug log options"))
+s3 = m:section(NamedSection, "log", "service", translate("Log options"))
 
-o6 = s3:option(Flag, "enabled", translate("Enable debug log"))
+o6 = s3:option(Flag, "enabled", translate("Enable log"))
 o6.rmempty = false
 o6.default = 0
 
-o7 = s3:option(Value, "adb_logfile", translate("Debug log file"))
+o7 = s3:option(Value, "adb_logfile", translate("Log file"))
 o7.rmempty = false
 o7.datatype = "string"
 
@@ -92,17 +95,29 @@ a5.rmempty = true
 a5.default = 20
 a5.datatype = "uinteger"
 
-a6 = e:option(Value, "adb_wanif", translate("Name of the logical wan interface") )
+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"
 
-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"
 
+a8 = e:option(Value, "adb_probeipv4", translate("IPv4 address used for uplink online check"))
+a8.optional = true
+a8.rmempty = true
+a8.default = "8.8.8.8"
+a8.datatype = "ip4addr"
+
+a9 = e:option(Value, "adb_probeipv6", translate("IPv6 address used for uplink online check"))
+a9.optional = true
+a9.rmempty = true
+a9.default = "2001:4860:4860::8888"
+a9.datatype = "ip6addr"
+
 return m