adblock: update 1.1.17

* change winspy url again
* various cosmetics left out in former release

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

net/adblock/files/adblock.init

@@ -21,10 +21,6 @@ adb_dnsprefix="adb_list"
 adb_pidfile="/var/run/adblock.pid"
 adb_log="$(which logger)"
 adb_uci="$(which uci)"
-if [ "$(${adb_uci} -q get "adblock.global.adb_restricted")" = "1" ]
-then
-    adb_uci="$(which true)"
-fi
 
 if [ -t 1 ]
 then
@@ -96,7 +92,7 @@ stop()
         /etc/init.d/dnsmasq restart
         /etc/init.d/firewall restart
     fi
-    uhttpd_pid="$(ps | pgrep -f "uhttpd -h /www/adblock")"
+    uhttpd_pid="$(pgrep -f "uhttpd -h /www/adblock")"
     if [ -n "${uhttpd_pid}" ]
     then
         kill -9 "${uhttpd_pid}"
@@ -110,6 +106,10 @@ stop()
 
 toggle()
 {
+    if [ "$(${adb_uci} -q get "adblock.global.adb_restricted")" = "1" ]
+    then
+        adb_uci="$(which true)"
+    fi
     if [ -d "${adb_dnshidedir}" ]
     then
         list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
@@ -130,6 +130,7 @@ toggle()
             "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'on'" 2>&1
         fi
     fi
+    return 0
 }
 
 cfgup()