#
# File : $Source: /cvsroot/ijbswa/current/default.filter,v $
#
-# $Id: default.filter,v 1.11 2002/05/24 00:57:18 oes Exp $
+# $Id: default.filter,v 1.11.2.1 2002/07/26 15:18:26 oes Exp $
#
# Purpose : Rules to process the content of web pages
#
#################################################################################
FILTER: webbugs Squish WebBugs (1x1 invisible GIFs used for user tracking)
-s/<img\s+[^>]*(?:width|height)\s*=\s*['"]?1\D[^>]*(?:width|height)\s*=\s*['"]?1\D[^>]*>//siUg
+s/<img\s+[^>]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*?>//siUg
##################################################################################
#################################################################################
FILTER: popups Kill all popups in JS and HTML
-s/([\n =;{}]|window\.)open\s*\\?\(/$1concat(/ig # JavaScript
-s/target\s*=\s*['"]?(_blank|_new)['"]?/notarget/ig # HTML
+s/([\n =;{}]|window\.)open\s*\\?\(/$1concat(/ig # JavaScript
+s/ target\s*=\s*(['"]?)(_blank|_new)\1?/notarget/ig # HTML
#################################################################################
# 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="$3">/iU
+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
#################################################################################
#
# Revisions :
# $Log: default.filter,v $
+# Revision 1.11.2.1 2002/07/26 15:18:26 oes
+# - All filters reviewed and many shorcomings fixed
+# - New filters: img-reorder, banners-by-link and js-events
+# - Jobs reorderd because they are now executed in order of
+# appearance
+#
# Revision 1.11 2002/05/24 00:57:18 oes
# Made WeBugs job ungreedy; Fixes bug 559190
#