X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=3159c1668bcdb470e6db0a38e5ff7340212ab180;hp=4974cf28db2d888047fc2283f2769bac944ec0e2;hb=2d6b5d2e894f920d7e376a9dc4fa436a8dbefcec;hpb=1015a9f6cb8ffa6864e2de9c191d700a67bc3dc6

diff --git a/default.filter b/default.filter
index 4974cf28..3159c166 100644
--- a/default.filter
+++ b/default.filter
@@ -2,17 +2,13 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.6 2002/04/03 19:49:52 swa Exp $
+#  $Id: default.filter,v 1.9 2002/04/11 07:36:35 oes Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
 #  Copyright   :  Written by and Copyright
 #                 Privoxy team. http://www.privoxy.org/
 #
-#                 Based on the Internet Junkbuster originally written
-#                 by and Copyright (C) 1997 Anonymous Coders and
-#                 Junkbusters Corporation.  http://www.junkbusters.com
-#
 # We value your feedback. However, to provide you with the best support,
 # please note:
 #  
@@ -103,7 +99,7 @@ s|(<script.*)document\.referrer(.*</script>)|$1"Not Your Business!"$2|Usg
 
 # The status bar is for displaying link targets, not pointless blahblah
 #
-s/status='.*?';*//ig
+s/window.status\s*=\s*['"].*?['"]/dUmMy=1/ig
 
 # Kill OnUnload popups. Yummy. Test: http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html
 #
@@ -128,26 +124,30 @@ s|<meta\s+http-equiv=['"]?set-cookie['"]?\s+content=[^>].*>|<!--no cookies here
 
 ##################################################################################
 #
-# no-popups: Kill all popups in JS and HTML
+# popups: Kill all popups in JS and HTML
 #
 #################################################################################
-FILTER: no-popups Kill all popups in JS and HTML
+FILTER: popups Kill all popups in JS and HTML
+
+s/window\.open\s*\(/concat(/ig               # JavaScript
+s/([ =;])open\s*\(/$1concat(/ig              # JavaScript alternative
+s/target=['"]?(_blank|_new)['"]?/notarget/ig # HTML
 
-s/window\.open\(/1;''\.concat\(/ig           # JavaScript
-s/target=['"]?_blank['"]?/target_crunched/ig # HTML
-s/target=['"]?_new['"]?/target_crunched/ig   # HTML
 
 #################################################################################
 #
-# frameset-borders: Give frames a border and make them resizable
+# frameset-borders: Give frames a border, make them resizable and scrollable
 #
 #################################################################################
 FILTER: frameset-borders Give frames a border and make them resizable
 
 s/(<frameset [^>]+)framespacing=['"]?(no|0)['"]?(.*>)/$1$3/igU
-s/(<frameset [^>]+)frameborder=['"]?(no|0)['"]?(.*>)/$1$3/igU
-s/(<frame [^>]+)border=['"]?(no|0)['"]?(.*>)/$1$3/igU
-s/(<frame [^>]+)resizable=['"]?(no|0|false)['"]?(.*>)/$1$3/igU 
+s/(<frameset [^>]+)(frame)?border=['"]?(no|0)['"]?(.*>)/$1$4/igU
+
+s/(<frame [^>]+)frameborder=['"]?(no|0)['"]?(.*>)/$1$3/igU
+s/(<frame [^>]+)noresize(.*>)/$1$2/igU
+s/(<frame [^>]+)resizable=['"]?(no)['"]?(.*>)/$1$3/igU 
+s/(<frame [^>]+)scrolling=['"]?(no)['"]?(.*>)/$1$3/igU
 
 #################################################################################
 #
@@ -161,10 +161,10 @@ s/<img\s+[^>]*?(width|height)\s*=\s*['"]?1\D[^>]*?(width|height)\s*=\s*['"]?1(\D
 
 #################################################################################
 #
-# no-refresh: Kill automatic refresh tags (for dial-on-demand setups)
+# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups)
 #
 #################################################################################
-FILTER: no-refresh Kill automatic refresh tags (for dial-on-demand setups)
+FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups)
 
 s/<meta\s+http-equiv=['"]?refresh['"]?\s+content=['"]?[0-9]*;\s+url=([^>]*)['"]?>/<link rev="x-refresh" href=$1>/iU   
 s/<meta\s+http-equiv=['"]?page-enter['"]?\s+content=[^>].*>/<!--no page enter for me-->/iU 
@@ -179,7 +179,7 @@ FILTER: fun Text replacements for subversive browsing fun!
 
 s/microsoft(?!.com)/MicroSuck/ig
 
-# Buzzword Bingo (example for extended syntax)
+# Buzzword Bingo (example for extended regex syntax)
 #
 s* industry[ -]leading \
 |  cutting[ -]edge \
@@ -202,7 +202,6 @@ FILTER: nimda Remove Nimda (virus) code
 
 s%<script language="JavaScript">(window\.open|1;''\.concat)\("readme\.eml", null, "resizable=no,top=6000,left=6000"\)</script>%<br><font size="7"> WARNING: This Server is infected with <a href="http://www.cert.org/advisories/CA-2001-26.html">Nimda</a>!</font>%g
 
-
 #################################################################################
 #
 # banners-by-size: Kill banners by size
@@ -238,6 +237,16 @@ s|<img\s+[^>]*?(width=['"]?336\D)[^>]*(height=['"]?280[^>]*?)>|<img src="http://
 s|<img\s+[^>]*?(width=['"]?200\D)[^>]*(height=['"]?50[^>]*?)>|<img src="http://config.privoxy.org/send-banner?type=auto" $1 $2>|sig
 
 
+#################################################################################
+#
+# shockwave-flash: Kill embedded Shockwave Flash objects
+#
+#################################################################################
+FILTER: shockwave-flash Kill embedded Shockwave Flash objects
+
+s|<embed [^>]*application/x-shockwave-flash.*</embed>|<!-- Squished Shockwave Flash Embed -->|sigU
+
+
 #################################################################################
 #
 # crude-parental: Crude parental filtering?  (Use along with a suitable blocklist).
@@ -258,6 +267,15 @@ s+^.*warez.*$+<html><head><title>No Warez</title></head><body><h3>You're not sea
 #
 #  Revisions   :
 #     $Log: default.filter,v $
+#     Revision 1.9  2002/04/11 07:36:35  oes
+#     Generalized js-popup filter
+#
+#     Revision 1.8  2002/04/10 17:07:21  oes
+#     Fixed potentially desctructive jobs, added noflash filter
+#
+#     Revision 1.7  2002/04/09 18:34:51  oes
+#     Fixed HTML syntax in replacements
+#
 #     Revision 1.6  2002/04/03 19:49:52  swa
 #     name change
 #