Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2498 from dibdot/adblock

Browse source 
luci-app-adblock: small controller changes
This commit is contained in:
Dirk Brenken 2019-02-02 18:02:51 +01:00 committed by GitHub
commit e91e89b28a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-app-adblock/luasrc/controller/adblock.lua
View file

@ -16,7 +16,9 @@ function index()
end end
entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 30).dependent = false entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 30).dependent = false
entry({"admin", "services", "adblock", "tab_from_cbi"}, cbi("adblock/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true entry({"admin", "services", "adblock", "tab_from_cbi"}, cbi("adblock/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true
if nixio.fs.access("/usr/sbin/tcpdump") then
entry({"admin", "services", "adblock", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true entry({"admin", "services", "adblock", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true
end
entry({"admin", "services", "adblock", "log"}, template("adblock/logread"), _("Logfile"), 30).leaf = true entry({"admin", "services", "adblock", "log"}, template("adblock/logread"), _("Logfile"), 30).leaf = true
entry({"admin", "services", "adblock", "advanced"}, firstchild(), _("Advanced"), 100) entry({"admin", "services", "adblock", "advanced"}, firstchild(), _("Advanced"), 100)
entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
@ -143,13 +145,7 @@ function report_text()
end end
function logread() function logread()
local content local content = util.trim(util.exec("logread -e 'adblock-'")) or ""
if nixio.fs.access("/var/log/messages") then
content = util.trim(util.exec("grep -F 'adblock-' /var/log/messages"))
else
content = util.trim(util.exec("logread -e 'adblock-'"))
end
if content == "" then if content == "" then
content = "No adblock related logs yet!" content = "No adblock related logs yet!"