projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-app-adblock: sync with adblock 3.5.0
[project/luci.git]
/
applications
/
luci-app-adblock
/
luasrc
/
controller
/
adblock.lua
diff --git
a/applications/luci-app-adblock/luasrc/controller/adblock.lua
b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index
0cfbb5f
..
d4368e7
100644
(file)
--- a/
applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/
applications/luci-app-adblock/luasrc/controller/adblock.lua
@@
-27,7
+27,7
@@
function logread()
local logfile
if nixio.fs.access("/var/log/messages") then
local logfile
if nixio.fs.access("/var/log/messages") then
- logfile = util.trim(util.exec("
cat /var/log/messages | grep -F 'adblock-'
"))
+ logfile = util.trim(util.exec("
grep -F 'adblock-' /var/log/messages
"))
else
logfile = util.trim(util.exec("logread -e 'adblock-'"))
end
else
logfile = util.trim(util.exec("logread -e 'adblock-'"))
end
@@
-35,7
+35,7
@@
function logread()
end
function queryData(domain)
end
function queryData(domain)
- if domain
and domain:match("^[a-zA-Z0-9%-%._]+$")
then
+ if domain then
luci.http.prepare_content("text/plain")
local cmd = "/etc/init.d/adblock query %q 2>&1"
local util = io.popen(cmd % domain)
luci.http.prepare_content("text/plain")
local cmd = "/etc/init.d/adblock query %q 2>&1"
local util = io.popen(cmd % domain)