diff options
| author | Dirk Brenken <dev@brenken.org> | 2019-02-02 18:02:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 18:02:51 +0100 |
| commit | e91e89b28afc05e575ee1f70d7a897ecb270bb58 (patch) | |
| tree | 3c41b5c7c8275f2a4058c5051ab17610c219226f /applications | |
| parent | 44680dc8057a3437f07cae8dbac29b2490baf947 (diff) | |
| parent | 09ea2573ff32571f8670bfc197b3f947abaf46b2 (diff) | |
Merge pull request #2498 from dibdot/adblock
luci-app-adblock: small controller changes
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-adblock/luasrc/controller/adblock.lua | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index 4641ac93b..d75296275 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -16,7 +16,9 @@ function index() end 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", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true + if nixio.fs.access("/usr/sbin/tcpdump") then + 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", "advanced"}, firstchild(), _("Advanced"), 100) entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true @@ -143,14 +145,8 @@ function report_text() end 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 content = "No adblock related logs yet!" end |