Merge pull request #2389 from dibdot/adblock

luci-app-adblock: minor fixes

diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index 0cfb8fc80c2563e308b8ef843090983ca29dd07a..e5061bc9d9537bf0d9a650175d89c972475967c0 100644 (file)
--- 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 a28ca171b6b91b3fef70d80054ede069518ac713..4e3d65ba75e4970fd024cbd55650683135bc20e4 100644 (file)
--- 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)