X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=f4d1b1a756732d710dcff356c3c92e3625f265cc;hp=3c14ed77de4bf5b3eae4aeeb505011e23ac567e1;hb=745615ada539f3171f2951440b01a10af61b83b2;hpb=efc4b6e17c0ca19bbb61287eaa86a5a941576e1f
diff --git a/default.filter b/default.filter
index 3c14ed77..f4d1b1a7 100644
--- a/default.filter
+++ b/default.filter
@@ -2,11 +2,11 @@
#
# File : $Source: /cvsroot/ijbswa/current/default.filter,v $
#
-# $Id: default.filter,v 1.8 2002/04/10 17:07:21 oes Exp $
+# $Id: default.filter,v 1.11.2.23 2004/02/17 13:34:01 oes Exp $
#
# Purpose : Rules to process the content of web pages
#
-# Copyright : Written by and Copyright
+# Copyright : Written by and Copyright (C) 2001 - 2004 the
# Privoxy team. http://www.privoxy.org/
#
# We value your feedback. However, to provide you with the best support,
@@ -62,48 +62,83 @@
#################################################################################
#
-# html-annoyances: Get rid of particularly annoying HTML abuse
+# js-annoyances: Get rid of particularly annoying JavaScript abuse
#
#################################################################################
-FILTER: html-annoyances Get rid of particularly annoying HTML abuse
+FILTER: js-annoyances Get rid of particularly annoying JavaScript abuse
-# New browser windows (if allowed -- see no-popups filter below) should be
-# resizeable and have a location and status bar
+# Note: Most of these jobs would be safer if restricted to a
+# )|$1never|sigU
-# Is this evil?
+# If we allow window.open, we want normal window features:
+# Test: http://www.htmlgoodies.com/beyond/notitle.html
#
-#s/margin(height|width)=[0-9]*//gi
-#s/noresize/yesresize/igU
+s/(open\s*\([^\)]+resizable=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+location=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+status=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+scroll(?:ing|bars)=)(["']?)(?:no|0)\2/$1$2auto$2/sigU
+s/(open\s*\([^\)]+menubar=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+toolbar=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+directories=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+fullscreen=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
+s/(open\s*\([^\)]+always(?:raised|lowered)=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
+s/(open\s*\([^\)]+z-?lock=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
+s/(open\s*\([^\)]+hotkeys=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
+s/(open\s*\([^\)]+titlebar=)(["']?)(?:no|0)\2/$1$2yes$2/sigU
+s/(open\s*\([^\)]+always(?:raised|lowered)=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
#################################################################################
#
-# js-annoyances: Get rid of particularly annoying JavaScript abuse
+# js-events: Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites)
#
#################################################################################
-FILTER: js-annoyances Get rid of particularly annoying JavaScript abuse
+FILTER: js-events Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites)
+
+s/(on|event\.)((mouse(over|out|down|up|move))|(un)?load|contextmenu|selectstart)/never/ig
+# Not events, but abused on the same type of sites:
+s/(alert|confirm)\s*\(/concat(/ig
+s/settimeout\(/concat(/ig
-# Get rid of Javascript referrer tracking. Test page: http://www.randomoddness.com/untitled.htm
+#################################################################################
+#
+# html-annoyances: Get rid of particularly annoying HTML abuse
#
-s|()|$1"Not Your Business!"$2|Usg
+#################################################################################
+FILTER: html-annoyances Get rid of particularly annoying HTML abuse
-# The status bar is for displaying link targets, not pointless blahblah
+# New browser windows (if allowed -- see no-popups filter below) should be
+# resizeable and have a location and status bar
#
-s/window.status\s*=\s*['"].*?['"]/dUmMy=1/ig
+s/(]+resizable=)(['"]?)(?:no|0)\2/$1$2yes$2/igU
+s/(]+location=)(['"]?)(?:no|0)\2/$1$2yes$2/igU
+s/(]+status=)(['"]?)(?:no|0)\2/$1$2yes1$2/igU
+s/(]+scrolling=)(['"]?)(?:no|0)\2/$1$2auto$2/igU
+s/(]+menubar=)(['"]?)(?:no|0)\2/$1$2yes$2/igU
-# Kill OnUnload popups. Yummy. Test: http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html
+# The