From daa0daecf968b97927077726b0724458693f644a Mon Sep 17 00:00:00 2001 From: oes Date: Thu, 1 Aug 2002 11:20:13 +0000 Subject: [PATCH] Fixed bugs 587802, 577802 and an unreported one --- default.filter | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/default.filter b/default.filter index 006f5d7b..b0942231 100644 --- a/default.filter +++ b/default.filter @@ -2,7 +2,7 @@ # # 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 # @@ -151,7 +151,7 @@ s|||igU ################################################################################# FILTER: webbugs Squish WebBugs (1x1 invisible GIFs used for user tracking) -s/]*(?:width|height)\s*=\s*['"]?1\D[^>]*(?:width|height)\s*=\s*['"]?1\D[^>]*>//siUg +s/]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*?>//siUg ################################################################################## @@ -161,8 +161,8 @@ s/]*(?:width|height)\s*=\s*['"]?1\D[^>]*(?:width|height)\s*=\s*['"]?1\ ################################################################################# 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 ################################################################################# @@ -189,7 +189,7 @@ FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups) # Note: Only deactivates refreshes with more than 9 seconds delay to # preserve monster-stupid but common redirections via meta tags. # -s/\2]*)\2\s*>//iU +s/\2]*))?\2\s*>//iU ################################################################################# @@ -347,6 +347,12 @@ s+^.*warez.*$+No Warez

You're not sea # # 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 # -- 2.39.2