X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=re_filterfile;h=48645cfebb5d14419a01c99fea35516e7eb07725;hp=16c073bfd4c9e1bf55c509a9b0eda1e00c733c14;hb=f500d7362572c2d469df3af606feffe5d4e50142;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7

diff --git a/re_filterfile b/re_filterfile
index 16c073bf..48645cfe 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -5,6 +5,10 @@
 # Note that you are free to choose the delimter as you
 # see fit.
 #
+# Note: in addidion to the Perl-options egimosx, U is supported
+# and turns the default to ungreedy matching. Add ? to quantifiers
+# to switch back to greedy.
+#
 
 # Kill OnUnload popups. Yummy.
 # check it out on http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html
@@ -30,7 +34,9 @@ s/menubar="?(no|0)"?/menubar=1/ig
 #s/margin(height|width)=[0-9]*//gi
 
 # Remove frameborder=0 and border=0 from framesets
-s/(<frameset[ -z]+)(frame)?border="?(no|0)"?/$1/ig
+#
+s/(<frameset[^>]+?)border=['"]?(no|0)['"]?/$1/ig
+s/(<frameset[^>]+?)frameborder=['"]?(no|0)['"]?/$1/ig
 
 # The status bar is for displaying link targets, not pointless buzzwords.
 # Again, check it out on http://www.airport-cgn.de/
@@ -40,7 +46,29 @@ s/status='.*?';*//ig
 # Kill *all* popups a la popup.c. (But for *all* sites, so I wouldn't do that.)
 #
 # JavaScript: s/window\.open\(/who_wants_this_to.open(/ig
-# HTML      : s/target="?_blank"?/target_who/g
+# HTML      : s/target=['"]?_blank['"]?/target_who/g
+
+# Kill banners by size:
+# (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html)
+#
+s|<img [^>]*?(width=['"]?468\D)[^>]*(height=['"]?60\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?234\D)[^>]*(height=['"]?60\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?88\D)[^>]*(height=['"]?31\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?90\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?60\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?160\D)[^>]*(height=['"]?600\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?600\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?125\D)[^>]*(height=['"]?125\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?240\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?180\D)[^>]*(height=['"]?150\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?300\D)[^>]*(height=['"]?250\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?250\D)[^>]*(height=['"]?250\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?240\D)[^>]*(height=['"]?400\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+s|<img [^>]*?(width=['"]?336\D)[^>]*(height=['"]?280\D).*?>|<img src=http://no.where/ijb-send-banner.gif $1 $2>|ig
+
+# Squish WebBugs:
+#
+s/<img [^>]*?(width|height) *= *['"]?1\D[^>]*?(width|height) *= *['"]?1\D.*?>/<!-- Squished WebBug -->/ig
 
 # Fun stuff:
 #