luci-app-adblock: sync with adblock 4.5.0-4

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

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 264b2c954953fd2a945a5d6a91621e74d4b399ca..a81ca23c826ab9db4aede5c08aa9088f308bb6ef 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for Adblock
 LUCI_DEPENDS:=+luci-base +adblock
 
 PKG_VERSION:=4.5.0
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
index e79dccfb48fa4bc5b12c28f35e2ff351b29e1f19..8302a5ce99258abfffad8ff35f5279ded62acf32 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
@@ -317,6 +317,7 @@ return view.extend({
                                E('th', { 'class': 'th' }, _('Date')),
                                E('th', { 'class': 'th' }, _('Time')),
                                E('th', { 'class': 'th' }, _('Client')),
+                               E('th', { 'class': 'th' }, _('Interface')),
                                E('th', { 'class': 'th' }, _('Type')),
                                E('th', { 'class': 'th' }, _('Domain')),
                                E('th', { 'class': 'th' }, _('Answer')),
@@ -352,6 +353,7 @@ return view.extend({
                                        content[0].requests[i].date,
                                        content[0].requests[i].time,
                                        content[0].requests[i].client,
+                                       content[0].requests[i].iface,
                                        content[0].requests[i].type,
                                        '<a href="https://ip-api.com/#' + encodeURIComponent(content[0].requests[i].domain) + '" target="_blank" rel="noreferrer noopener" title="Domain Lookup">' + content[0].requests[i].domain + '</a>',
                                        content[0].requests[i].rc,
@@ -514,7 +516,6 @@ return view.extend({
                        window.addEventListener('resize', function() {
                                drawPie(rot);
                        });
-
                        const tooltip = document.getElementById('dnsPieTooltip');
                        canvas.addEventListener('mousemove', function(ev) {
                                const rect = canvas.getBoundingClientRect();