adblock: update 1.4.6
* added a 'window.close()' to adblock landing page to automatically close any pop-ups that might get loaded with a blocked ad * simplified dnsmasq check in ap mode Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
parent
4e873aad3c
commit
a029b3f9f4
4 changed files with 7 additions and 4 deletions
|
@ -7,7 +7,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=adblock
|
PKG_NAME:=adblock
|
||||||
PKG_VERSION:=1.4.5
|
PKG_VERSION:=1.4.6
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=GPL-3.0+
|
PKG_LICENSE:=GPL-3.0+
|
||||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||||
|
|
|
@ -175,7 +175,7 @@ f_envcheck()
|
||||||
rc=-1
|
rc=-1
|
||||||
f_log "AP mode detected, please set local LuCI instance to ports <> 80/443"
|
f_log "AP mode detected, please set local LuCI instance to ports <> 80/443"
|
||||||
f_exit
|
f_exit
|
||||||
elif [ -z "$(pgrep -f "dnsmasq")" ]
|
elif [ ! -f "/etc/init.d/dnsmasq" ]
|
||||||
then
|
then
|
||||||
rc=-1
|
rc=-1
|
||||||
f_log "please enable the local dnsmasq instance to use adblock"
|
f_log "please enable the local dnsmasq instance to use adblock"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
adb_pid="${$}"
|
adb_pid="${$}"
|
||||||
adb_pidfile="/var/run/adblock.pid"
|
adb_pidfile="/var/run/adblock.pid"
|
||||||
adb_scriptver="1.4.5"
|
adb_scriptver="1.4.6"
|
||||||
adb_mincfgver="2.4"
|
adb_mincfgver="2.4"
|
||||||
adb_scriptdir="${0%/*}"
|
adb_scriptdir="${0%/*}"
|
||||||
if [ -r "${adb_pidfile}" ]
|
if [ -r "${adb_pidfile}" ]
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
<html>
|
<html>
|
||||||
<body>
|
<head>
|
||||||
|
<script>window.close();</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
<img src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA=" alt=""></img>
|
<img src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA=" alt=""></img>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in a new issue