X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=re_filterfile;h=3631c260a0a5e2ba8e8d14b8888b422d687e4020;hb=f10e5df2fa4a1a5d7e53a354bf9196560e1bf5b2;hp=6e40a899a36927071972a1633f5444f2d12feccc;hpb=1952a87fe55ceeff77c376d61e281df7aee11db7;p=privoxy.git

diff --git a/re_filterfile b/re_filterfile
index 6e40a899..3631c260 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -34,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/
@@ -44,25 +46,25 @@ 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
+s|<img [^>]*?(width=['"]?468\D)[^>]*(height=['"]?60\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?234\D)[^>]*(height=['"]?60\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?88\D)[^>]*(height=['"]?31\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?90\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?60\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?160\D)[^>]*(height=['"]?600\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?600\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?125\D)[^>]*(height=['"]?125\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?120\D)[^>]*(height=['"]?240\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?180\D)[^>]*(height=['"]?150\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?300\D)[^>]*(height=['"]?250\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?250\D)[^>]*(height=['"]?250\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?240\D)[^>]*(height=['"]?400\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
+s|<img [^>]*?(width=['"]?336\D)[^>]*(height=['"]?280\D).*?>|<img src=http://i.j.b/ijb-send-banner $1 $2>|ig
 
 # Squish WebBugs:
 #