diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index acd02ebe3c..8a713d72ca 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock -PKG_VERSION:=4.5.6 -PKG_RELEASE:=5 +PKG_VERSION:=4.5.7 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Dirk Brenken diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js index e8c6bc6cf7..bdcd0140d1 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js @@ -668,6 +668,17 @@ return view.extend({ o.optional = true; o.rmempty = true; + o = s.taboption('adv_report', form.Value, 'adb_repfilter', _('Report Filter'), _('Optional tcpdump filter expression, logically ANDed to the internal port filter.')); + o.placeholder = 'not net 10.0.0.0/24'; + o.optional = true; + o.rmempty = true; + o.validate = function (section_id, value) { + if (!value || /^[a-zA-Z0-9 \t.:\/()\[\]!&|<>=+*%\\-]+$/.test(value)) { + return true; + } + return _('Invalid characters in the tcpdump filter expression!'); + }; + o = s.taboption('adv_report', form.Flag, 'adb_represolve', _('Resolve IPs'), _('Resolve reporting IP addresses by using reverse DNS (PTR) lookups.')); o.rmempty = true;