Add explanation for send-banner?type=custom in default.filter. See

[privoxy.git] / default.filter

diff --git a/default.filter b/default.filter
index b489818..b127c02 100644 (file)
--- a/default.filter
+++ b/default.filter
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.13 2002/09/11 16:04:20 oes Exp $
+#  $Id: default.filter,v 1.17 2002/11/12 16:16:49 oes Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
@@ -82,7 +82,7 @@ s|document\.referrer|"Not Your Business!"|gisU
 
 # The status bar is for displaying link targets, not pointless blahblah
 #
-s/([\n =;{}]|window\.)(default)?status\s*=/$1dUmMy=/ig
+s/(([\n =;{}]|window\.)(default)?status)\s*=\s*((['"]).*?\5)/if(typeof(this.href) != 'undefined') $1 = $4 + ' URL: ' + this.href;else return false/ig
 
 # Kill OnUnload popups. Yummy.
 # Test: http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html
@@ -190,8 +190,7 @@ FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups)
 # Note: Only deactivates refreshes with more than 9 seconds delay to
 #       preserve monster-stupid but common redirections via meta tags.
 #
-s/<meta\s+http-equiv\s*=\s*(['"]?)refresh\1\s+content\s*=\s*(['"]?)\d{2,}\s*(;\s*url\s*=\s*([^>\2]*))?\2\s*>/<link rev="x-refresh" href="$4">/iU
-
+s/<meta\s+http-equiv\s*=\s*(['"]?)refresh\1\s+content\s*=\s*(['"]?)\d{2,}\s*(;\s*url\s*=\s*([^>\2]*))?\2/<link rev="x-refresh" href="$4"/iU
 
 #################################################################################
 #
@@ -205,8 +204,8 @@ FILTER: img-reorder Reorder attributes in <img> tags to make the banners-by-* fi
 # This makes banners-by-size more effective and allows both banners-by-size
 # and banners-by-link to preserve the original image URL in the alt attribute.
 
-s|<img\s+?([^>]*)src\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2$1|siUg
-s|<img\s+?([^>]*)src\s*=\s*([^'">\\\s]+)|<img src=$2$1|sig
+s|<img\s+?([^>]*) src\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2 $1|siUg
+s|<img\s+?([^>]*) src\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
 
 s|<img (src=(?:(['"])[^>\\\\2]+\2\|[^'">\\\s]+?))([^>]*)width\s*=\s*(["']?)(\d+?)|<img $1 width=$4$5$4$3|siUg
 
@@ -221,6 +220,7 @@ s|<img (src=(?:(['"])[^>\\\\2]+\2\|[^'">\\\s]+?))([^>]*)width\s*=\s*(["']?)(\d+?
 #
 # Note: Use http://config.privoxy.org/send-banner?type=trans for a transparent 1x1 image
 #       Use http://config.privoxy.org/send-banner?type=pattern for a grey/white pattern image
+#       Use http://config.privoxy.org/send-banner?type=custom for the image specified in config
 #       Use http://config.privoxy.org/send-banner?type=auto  to auto-select.
 #
 # Note2: Use img-reorder before this filter to ensure maximum matching success
@@ -396,6 +396,18 @@ s/\x9B/>/g                  # 155
 #
 #  Revisions   :
 #     $Log: default.filter,v $
+#     Revision 1.17  2002/11/12 16:16:49  oes
+#     Exchanged js-annoyance filter against status bar rewrites with improved version by Don Libes
+#
+#     Revision 1.16  2002/11/11 13:40:38  oes
+#     Make refresh-tags filter work even on incorrect refresh tags like found on usatoday.com
+#
+#     Revision 1.15  2002/11/08 16:40:56  oes
+#     Made img-reorder more cautious. Fixes bug #632715
+#
+#     Revision 1.14  2002/10/13 21:58:20  hal9
+#     Add demoronizer filter to sync with 3.0.1.
+#
 #     Revision 1.13  2002/09/11 16:04:20  oes
 #     Preserve original quoting style in <img> tags wherever possible. Fixes Bug #605956
 #