From: Dirk Brenken <dev@brenken.org>
Date: Sat, 22 Dec 2018 17:37:45 +0000 (+0100)
Subject: luci-app-adblock: minor fixes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F2389%2Fhead;p=project%2Fluci.git

luci-app-adblock: minor fixes

* use new XHR default on report page
* fix wrong string.find syntax

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index 0cfb8fc80c..e5061bc9d9 100644
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -54,7 +54,7 @@ function adb_action(name, domain)
 		local file = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist"
 		if nixio.fs.access(file) then
 			local blacklist = nixio.fs.readfile(file)
-			if not string.find(blacklist, domain, 1, plain)
+			if not string.find(blacklist, domain, 1, true)
 			then
 				nixio.fs.writefile(file, blacklist.. domain.. "\n")
 			end
@@ -63,7 +63,7 @@ function adb_action(name, domain)
 		local file = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist"
 		if nixio.fs.access(file) then
 	 		local whitelist = nixio.fs.readfile(file)
-			if not string.find(whitelist, domain, 1, plain)
+			if not string.find(whitelist, domain, 1, true)
 			then
 				nixio.fs.writefile(file, whitelist.. domain.. "\n")
 			end
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/report.htm b/applications/luci-app-adblock/luasrc/view/adblock/report.htm
index a28ca171b6..4e3d65ba75 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/report.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/report.htm
@@ -166,7 +166,7 @@ This is free software, licensed under the Apache License, Version 2.0
 		report_json(json_info);
 	});
 
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_json")%>', null,
+	XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_json")%>', null,
 	function(x, json_info)
 	{
 		if (!x || !json_info || !json_info.data)
@@ -188,7 +188,7 @@ This is free software, licensed under the Apache License, Version 2.0
 		report_text(x.responseText);
 	});
 
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_text")%>', null,
+	XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_text")%>', null,
 	function(x)
 	{
 		if (!x || !x.responseText)