From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Tue, 4 Apr 2017 12:28:44 +0000 (+0300)
Subject: Merge pull request #1096 from dibdot/app-adblock
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=1390a6465d643b16738052ccbb1583fd20e8db8f;hp=ae542668f5a15feec663235b29574ecf8ec53e61

Merge pull request #1096 from dibdot/app-adblock

luci-app-adblock: sync with adblock 2.5.1
---

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 7919b7151..b8318fe99 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -30,14 +30,14 @@ if data.adblock == nil then
 	btn.inputstyle = nil
 	btn.disabled = true
 elseif dnsFile1 ~= "" or dnsFile2 ~= "" then
-	btn.inputtitle = "Suspend adblock"
+	btn.inputtitle = translate("Suspend adblock")
 	btn.inputstyle = "reset"
 	btn.disabled = false
 	function btn.write()
 		luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
 	end
 else
-	btn.inputtitle = "Resume adblock"
+	btn.inputtitle = translate("Resume adblock")
 	btn.inputstyle = "apply"
 	btn.disabled = false
 	function btn.write()
@@ -51,8 +51,8 @@ o2.rmempty = false
 
 o3 = s:option(Value, "adb_iface", translate("Restrict interface reload trigger to certain interface(s)"),
 	translate("Space separated list of interfaces that trigger a reload action. "..
-	"To disable reload trigger at all set it to 'false'."))
-o3.rmempty =false
+	"To disable reload trigger at all remove all entries."))
+o3.rmempty =true
 
 -- Runtime information
 
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
index be606301e..5e064af85 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
@@ -25,7 +25,7 @@ This is free software, licensed under the Apache License, Version 2.0
 			;
 			input.parentNode.style.display = 'block';
 			input.style.display = 'inline';
-			stxhr.post('<%=url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' },
+			stxhr.post('<%=luci.dispatcher.build_url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' },
 				function(x)
 				{
 					if (x.responseText)