X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=default.filter;h=c845cedb487cd364827cde4982dfe26f16b02d1c;hb=7cc74c8124cd3aaa00a01a17c591eee9a18d0a64;hp=621f0c665542e24f91d9b952a23ea448dd098151;hpb=29907bee327168106f88c2ba0f3638312864fdff;p=privoxy.git

diff --git a/default.filter b/default.filter
index 621f0c66..c845cedb 100644
--- a/default.filter
+++ b/default.filter
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.69 2009/02/12 15:40:11 ler762 Exp $
+#  $Id: default.filter,v 1.75 2009/10/03 10:39:33 fabiankeil Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
@@ -580,7 +580,9 @@ s@</head>@<style type="text/css">\n\
  \#fbc, \#fbl, \#ra, .rhh {visibility: hidden !important;}\n\
  \#tpa1,\#tpa2,\#tpa3,\#tpa4,\#tpa5,\#tpa5, \#spl, .ch, \#ads,\
  \#toolbar, \#google_ads_frame, \#mbEnd {display: none !important;}\n\
- .main_body, .j {width: 100%}\n</style>\n$0@
+ .main_body, .j, \#res, .med, .hd, .g, .s\n\
+ {width: 99%; max-width: 100%; margin-left: 0; margin-right: 0;}\n\
+ </style>\n$0@
 s@<div style=\"padding-top:11px;min-width:500px\">@<div id="main_body">@
 s@(<table cellspacing=0 cellpadding=0 width=25% align=right bgcolor=\#ffffff border=0\
 |</font></td></tr></tbody></table><table align=\"right\" bgcolor=\"\#ffffff\"\
@@ -600,12 +602,17 @@ s@</head>@\n<style type="text/css">\n\
  /* Style sheet inserted by Privoxy's yahoo filter. */\n\
  \#symadbn, \#ymadbn, .yschbox, .yschhd, .bbox, \#yschsec, \#sec,\
  \#yschanswr, .yschftad, .yschspn, .yschspns, \#ygrp-sponsored-links,\
- \#nwad, \
+ \#nwad, \#MWA2, \#MSCM, \#yregad, \#sponsored-links,\
  \#ks-ypn-ads, .ad, \#east, \#ygrp-vital {display: none !important;}\n\
- \#yschpri, \#yschweb, \#pri, \#web, \#main {width: 100% !important; max-width: 100% !important;}\n\
+ \#yschpri, \#yschweb, \#pri, \#web, \#main, .yschttl, .abstr, .res \n\
+ {width: 99% !important; max-width: 100% !important;}\n\
+ .yschttl, .res, .res.indent, \#web {padding: 0px; margin: 0px !important;}\n\
+ \#web {padding-left: 0.5em}\n\
  \#yschqcon, \#yschtg {width: auto !important; /* No useless horizontal scrollbar please */}\n\
- \#northbanner{min-height:1px !important; height:1px !important; display: none !important;}\n\
- </style>\n$0@
+ \#composebox \#compose_editorArea {width: 70% !important; /* reasonably sized reply textarea please */\n\
+ </style>\n$0\n@
+
+s@(<textarea\s+id="composeArea"[^>]*)width:545px;@$1width:70%;@isU
 
 #################################################################################
 #
@@ -619,7 +626,7 @@ s@</head>@<style type="text/css">\n\
  /* Style sheet inserted by Privoxy's msn filter. */\n\
  .msn_ads, \#at, \#ar, .mktmsg {display: none !important;}\n\
  \#results, .flank, .results_area_flank, .results_area_stroke,\n\
- \#results_area, .SearchSection, .not, .sc_rslth1\n\
+ \#results_area, \#content, .sb_tlst, .sa_cc, .sb_ph, \#sw_main,\n\
 .content, \#sw_foot, \#bf, \#sw_content, \#sidebar, \#pag\n\
  {width: 99% !important; min-width: 99% !important;\n\
  max-width: 100% !important; /* width:100% sometimes causes horizontal scrollbars */}\n\
@@ -832,447 +839,3 @@ s@^X-Privoxy-Control:\s*@@i
 SERVER-HEADER-FILTER: privoxy-control Removes X-Privoxy-Control headers.
 
 s@^X-Privoxy-Control:.*@@i
-
-
-############################################################################## 
-#
-#  Revisions   :
-#     $Log: default.filter,v $
-#     Revision 1.69  2009/02/12 15:40:11  ler762
-#     more yahoo email ad blocking
-#
-#     Revision 1.68  2008/09/19 13:26:04  fabiankeil
-#     s@tounge@tongue@. Anonymously reported in #1648657.
-#
-#     Revision 1.67  2008/08/06 17:38:06  fabiankeil
-#     In banners-by-size, make sure white-space around the height
-#     attribute is removed as well and replace two spaces with
-#     "\s" so we don't get fooled by tabs. Fixes #2036125.
-#
-#     Revision 1.66  2008/08/03 17:27:47  fabiankeil
-#     Teach msn filter to catch a few new ad classes.
-#
-#     Revision 1.65  2008/07/21 13:43:44  fabiankeil
-#     Fix img-reorder regression introduced with my last commit.
-#     Some tags were terminated too soon, letting the browser render
-#     some of their arguments as text. Oops.
-#
-#     Revision 1.64  2008/07/12 15:49:09  fabiankeil
-#     - Don't let img-reorder touch width attributes
-#       that aren't followed by either whitespace or '>',
-#       as those usually indicate onclick nonsense.
-#       Problem and solution reported by Glenn Washburn in #2014552.
-#     - While at it, don't use more groups than necessary.
-#
-#     Revision 1.63  2008/06/27 12:53:41  fabiankeil
-#     Make sure the taggers css-requests and image-requests
-#     only match at the beginning of the header.
-#
-#     Revision 1.62  2008/06/21 17:02:03  fabiankeil
-#     Fix typo.
-#
-#     Revision 1.61  2008/05/21 18:44:43  fabiankeil
-#     - Let the content-type tagger ignore headers without value.
-#     - Remove a few unused lines at the end of the file.
-#
-#     Revision 1.60  2008/04/26 10:36:41  fabiankeil
-#     Let the msn filter hide another class.
-#
-#     Revision 1.59  2008/04/23 16:18:18  fabiankeil
-#     s@declarded@declared@
-#
-#     Revision 1.58  2008/02/02 15:27:19  fabiankeil
-#     Yet another yahoo update to get the width limitation removal working again.
-#
-#     Revision 1.57  2008/01/26 15:45:39  fabiankeil
-#     Don't let the less-download-windows filter mess up
-#     "Content-Type: application/x-shockwave-flash" headers.
-#
-#     Revision 1.56  2008/01/25 19:12:40  fabiankeil
-#     - Add yet another new yahoo ad id.
-#     - Don't let the first banners-by-link job punish URLs for merely
-#       containing the pattern "/jump/" when it should really look for
-#       "doubleclick\.net/jump/".
-#
-#     Revision 1.55  2007/12/31 19:53:59  fabiankeil
-#     Let the msn filter remove the width limitation again.
-#
-#     Revision 1.54  2007/12/31 19:11:31  fabiankeil
-#     - Let the yahoo filter remove the width limitation again.
-#     - Teach the blogspot filter to remove useless feed comment
-#       titles that only contain the beginning of the actual comment.
-#
-#     Revision 1.53  2007/12/23 15:48:12  fabiankeil
-#     - Lo and behold, the CSS fix for the MSN buttons is no longer necessary.
-#     - Add some new selectors the msn filter should hide.
-#     - Add the two yahoo selectors Lee reported in #1856574.
-#     - Add comments that the width limitation fixes stopped
-#       working for the msn and yahoo filter.
-#
-#     Revision 1.52  2007/11/27 18:35:48  fabiankeil
-#     Update CSS for the yahoo filter.
-#
-#     Revision 1.51  2007/11/04 16:15:11  fabiankeil
-#     - Add client-header taggers: client-ip-address,
-#       http-method, allow-post, complete-url and user-agent.
-#     - Add server-header tagger: content-type.
-#
-#     Revision 1.50  2007/11/03 15:05:30  fabiankeil
-#     Consistently use an empty line between the description and the PCRS code
-#     and end descriptions with dots. Patch submitted by Simon Ruderich.
-#
-#     Revision 1.49  2007/11/03 14:29:41  fabiankeil
-#     Spelling fixes mostly submitted by Simon Ruderich.
-#
-#     Revision 1.48  2007/10/17 18:11:32  fabiankeil
-#     Add privoxy-control header filters and taggers.
-#
-#     Revision 1.47  2007/10/06 15:45:25  fabiankeil
-#     Let msn hide sponsored links in #at divs.
-#
-#     Revision 1.46  2007/10/06 09:54:13  fabiankeil
-#     - Let msn hide sponsored links in #ar divs.
-#     - Teach banners-by-link not to block the graphs for sf's tracker statistics.
-#
-#     Revision 1.45  2007/08/11 16:54:12  fabiankeil
-#     - Complete the changes from r1.42.
-#     - Make crude-parental less sensitive to the amount of white-space,
-#       add the note that it doesn't work too well again and replace the
-#       DMOZ link with a less confusing explanation.
-#
-#     Revision 1.44  2007/07/18 11:06:56  hal9
-#     Replace notarget with '' in all popups filter to keep from breaking xhmtl per
-#     report from Siegfried Gipp.
-#
-#     Revision 1.43  2007/06/01 14:17:04  fabiankeil
-#     Mention possible delimiter conflicts with variables in dynamic pcrs commands.
-#
-#     Revision 1.42  2007/05/17 15:55:36  fabiankeil
-#     Undo an improperly tested last-minute change
-#     and turn "text-requests" back into "css-requests".
-#
-#     Revision 1.41  2007/05/17 15:45:41  fabiankeil
-#     - Mention new filter types and the 'D' option.
-#     - Header filters are now case-insensitive and accept a
-#       varying amount of whitespace after the colon.
-#     - Add another selector for yahoo ads.
-#     - New server-header filter: less-download-windows
-#     - New client-header taggers: text-requests and image-requests.
-#
-#     Revision 1.40  2007/03/20 15:40:00  fabiankeil
-#     Adjust to new world order with dedicated header-filter actions.
-#
-#     Revision 1.39  2007/02/21 14:10:23  fabiankeil
-#     - Fix a js-annoyances pcrs command that broke
-#       evaluated code. (BR #1124071, thanks to Bor Gergely)
-#     - Have unsolicited-popups and all-popups catch the
-#       wheather.com popup reported in in AF #1640173.
-#
-#     Revision 1.38  2007/02/19 11:22:48  hal9
-#     Adding back the orginal filter content to offset problems found by Fabian.
-#
-#     Revision 1.37  2007/02/17 13:29:44  hal9
-#     Updates to the crude parental filter per Feature Requests item #1648657.
-#
-#     Revision 1.36  2007/02/05 16:47:31  fabiankeil
-#     - Let banners-by-link look for "advert".
-#     - Fix XML systax problems with banners-by-link
-#       and banners-by-size (AF#1651570).
-#
-#     Revision 1.35  2006/12/21 12:28:12  fabiankeil
-#     Escaping special characters in filter descriptions is no
-#     longer necessary, it's done by Privoxy now.
-#
-#     Revision 1.34  2006/12/12 17:32:23  fabiankeil
-#     Added id mbEnd to google filter, it's now and then
-#     used for the sponsored links.
-#
-#     Have js-annoyances try to prevent status bar
-#     modifications where the status bar text is
-#     inside another variable. Fixes 1605710.
-#
-#     Revision 1.33  2006/11/16 17:10:43  fabiankeil
-#     Removed webbugs debugging comment again.
-#     The apostrophe could break JavaScript and
-#     the comment itself could mess up existing
-#     comments.
-#
-#     Revision 1.32  2006/11/10 18:04:04  fabiankeil
-#     Have no-ping print the ping warning in red.
-#
-#     Modified yahoo to keep in sync with recent
-#     CSS changes and to suppress a useless horizontal
-#     scrollbar.
-#
-#     msn now makes sure that the continue-link boxes
-#     act as links (the original CSS just changes the cursor).
-#
-#     Changed fun filter regex to leave microsoft links alone.
-#     Fixes BR 1019996.
-#
-#     Revision 1.31  2006/10/21 13:12:28  fabiankeil
-#     Added no-ping and hide-tor-exit-notation.
-#
-#     Adjusted jumping-windows to break less.
-#     Fixes BR 1146134.
-#
-#     Revision 1.30  2006/10/18 12:36:50  fabiankeil
-#     google filter now cleans Google groups as well.
-#
-#     Revision 1.29  2006/10/11 14:03:17  fabiankeil
-#     Changed img-reorder regex to only move width
-#     attributes if they are following at least one
-#     whitespace. Fixes BR 1328455.
-#
-#     Revision 1.28  2006/10/11 13:31:13  fabiankeil
-#     Added Anduin Withers' js-annoyances fix
-#     for not messing up escaped quotes. Fixes BR 999765.
-#
-#     Improved blogspot filter to make it less likely that
-#     the blogspot banner at the top of the page is missed.
-#
-#     Revision 1.27  2006/10/08 17:00:51  fabiankeil
-#     Modified webbugs filter to create a comment around the offending
-#     image instead of removing it entirely.
-#
-#     Adjusted regex to only match if there's at least one whitespace
-#     before the width and height attributes. Makes it more likely that
-#     they are indeed attributes, and not part of the value of another attribute.
-#     Solves BR 1035587.
-#
-#     Thanks to Martin Thomas for diagnosing the cause of the problem.
-#
-#     Revision 1.26  2006/10/06 18:06:16  fabiankeil
-#     Added header filter x-httpd-php-to-html
-#     and reverted another img-reorder whitespace
-#     problem.
-#
-#     Revision 1.25  2006/10/06 15:26:09  fabiankeil
-#     Bumped copyright year.
-#
-#     Reverted parts of the last img-reorder change
-#     which were intended to remove superfluous whitespace
-#     but had the side effect to mess up some tags.
-#
-#     Modified banners-by-size and banners-by-link to
-#     use border value "0" instead of "\0". Fixes BR 1100065.
-#
-#     Revision 1.24  2006/10/06 11:25:31  fabiankeil
-#     Taught img-reorder not to break img tags
-#     with empty src attributes. Fixes BR 1089474.
-#     Thanks to Raphael Moll for reporting.
-#
-#     Revision 1.23  2006/10/05 14:46:28  fabiankeil
-#     Replaced "<" in img-reorder's description with "&lt;".
-#
-#     Modified msn filter to tag ads with classes instead
-#     of ids. There may be more than one ad per page,
-#     but ids are required to be unique.
-#
-#     Revision 1.22  2006/10/04 19:17:14  fabiankeil
-#     Incorportated Frédéric Crozat's ie-exploits
-#     modification to make it less trigger-happy.
-#
-#     Modified blogspot filter to make .post-body
-#     scrollable if necessary.
-#
-#     Revision 1.21  2006/10/02 16:21:14  fabiankeil
-#     Adjusted yahoo filter to hide .yschspns as well.
-#     Added header filters: html-to-xml and xml-to-html.
-#
-#     Revision 1.20  2006/10/01 21:00:22  fabiankeil
-#     New site-specific filters: google, yahoo, msn and blogspot.
-#
-#     Revision 1.19  2006/07/18 14:48:45  david__schmidt
-#     Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
-#     with what was really the latest development (the v_3_0_branch branch)
-#
-#     Revision 1.11.2.23  2004/02/17 13:34:01  oes
-#     - Beefed up the protection of the unsolicited-popups
-#       filter against matching in JavaScript string constants.
-#     - Extended the fun filter with a German joke
-#     - Extended the site-specifics filter with a convenience
-#       reeplacement for managing mailing lists at SourceForge
-#
-#     Revision 1.11.2.22  2004/01/30 15:29:29  oes
-#     Updated the copyright note
-#
-#     Revision 1.11.2.21  2004/01/20 15:15:01  oes
-#     Detail enhancement in all-popups
-#
-#     Revision 1.11.2.20  2004/01/06 16:46:14  oes
-#     Fixed a JS syntax problem in jumping-windows
-#
-#     Revision 1.11.2.19  2003/12/17 17:09:25  oes
-#     Added remedy against IE address bar spoofing
-#
-#     Revision 1.11.2.18  2003/12/02 11:25:27  oes
-#     Fixed a line trashed in previous commit
-#
-#     Revision 1.11.2.17  2003/12/01 21:58:46  oes
-#     Assorted tuning:
-#
-#      - unsolicited-popups no longer matches at start or end of quoted
-#        strings, and is now activated earlier and deactivated later in
-#        the page.
-#      - replacement images in banners-by-* now without border
-#      - more effective shockwave flash flattening
-#      - Custom annoyance filtering for Yahoo Groups, Monster.com, NY Times.
-#
-#     Revision 1.11.2.16  2003/05/08 09:44:56  oes
-#     Allow extra parameters in blink,marquee tags. Fixes bug #734012
-#
-#     Revision 1.11.2.15  2003/03/30 13:57:08  oes
-#     Making unsolicited-popups safe for use on <html> tags enclosed in JS strings
-#
-#     Revision 1.11.2.14  2003/03/19 13:17:50  oes
-#     - Added filter "site-specifics" to address site specific problems
-#     - Fixed a small problem in the img-reorder filter
-#
-#     Revision 1.11.2.13  2003/03/18 19:28:59  oes
-#     Fixed a minor problem in the img-reorder filter
-#
-#     Revision 1.11.2.12  2003/03/15 14:06:58  oes
-#      - Assorted refinements, optimizations and fixes in the js-annoyances,
-#        img-reorder, banners-by-size, banners-by-link, webbugs, refresh-tags,
-#        html-annoyances, content-cookies and fun filters
-#      - Replaced filter "popups" by choice between two modes:
-#        - "unsolicited-popups" tries to catch only the unsolicited ones
-#        - "all-popups" tries to kill them all (as before)
-#      - New filter "tiny-textforms" Help those tiny or hard-wrap textareas.
-#      - New filter "jumping-windows" that prevents windows from resizing
-#        and moving themselves
-#      - Replaced "nimda" with more general "ie-exploits" filter in which
-#        all filters for exploits shall be collected
-#
-#     Revision 1.11.2.11  2002/11/12 16:14:43  oes
-#     Exchanged js-annoyance filter against status bar rewrites with improved version by Don Libes
-#
-#     Revision 1.11.2.10  2002/11/11 13:39:47  oes
-#     Make refresh-tags filter work even on incorrect refresh tags like found on usatoday.com
-#
-#     Revision 1.11.2.9  2002/11/08 16:39:17  oes
-#     Made img-reorder more cautious. Fixes bug #632715
-#
-#     Revision 1.11.2.8  2002/10/13 21:56:52  hal9
-#     Adding demoronizer filter. This should include all the common abuses. I have
-#     left a few of the rare cases commented out (never found these in the wild).
-#
-#     Revision 1.11.2.7  2002/09/25 15:09:39  oes
-#     Preserve original quoting style in <img> tags wherever possible. Fixes Bug #605956
-#
-#     Revision 1.11.2.6  2002/08/23 14:12:26  oes
-#     Proofed frameset-borders against "fremaborder=0 border=0"
-#
-#     Revision 1.11.2.5  2002/08/22 15:05:20  oes
-#     Added Filter to make Quicktime movies saveable (thanks to aaron@linville.org for the idea)
-#
-#     Revision 1.11.2.4  2002/08/10 11:32:29  oes
-#     Attribute values in replacement tags of banners-by-size filter now undelimited. (Fixes bug #592493)
-#
-#     Revision 1.11.2.3  2002/08/05 11:43:56  oes
-#     Fixed a bug in the popups filter that was introduced with the last fix :-(
-#
-#     Revision 1.11.2.2  2002/08/01 11:20:13  oes
-#     Fixed bugs 587802, 577802 and an unreported one
-#
-#     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
-#
-#     Revision 1.10  2002/04/18 10:14:19  oes
-#     renamed some filters
-#
-#     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
-#
-#     Revision 1.5  2002/03/27 15:30:26  swa
-#     have a consistent appearance
-#
-#     Revision 1.4  2002/03/26 22:29:54  swa
-#     we have a new homepage!
-#
-#     Revision 1.3  2002/03/24 16:08:03  jongfoster
-#     Fixing banners-by-size for new config URLs
-#
-#     Revision 1.2  2002/03/24 13:02:18  swa
-#     name change related issues.
-#
-#     Revision 1.1  2002/03/24 11:37:39  jongfoster
-#     Name change
-#
-#     Revision 1.24  2002/03/16 20:39:54  oes
-#      - Added descriptions to the filters so users will know what they select in the cgi editor
-#      - Added content-cookies filter
-#      - Bugfixed many jobs (Thanks to Al for some hints)
-#
-#     Revision 1.22  2002/03/12 13:42:50  oes
-#     Fixing & Optimizing REs
-#
-#     Revision 1.21  2002/03/12 11:59:20  oes
-#     Beefed up Buzzword Bingo
-#
-#     Revision 1.20  2002/03/12 01:42:50  oes
-#     Introduced modular filters
-#
-#     Revision 1.19  2002/03/10 19:49:24  oes
-#     Added expression to kill referer tracking in JavaScripts
-#
-#     Revision 1.18  2002/03/08 17:14:12  oes
-#     PNG -> image in comments
-#
-#     Revision 1.17  2002/03/07 03:50:54  oes
-#     Adapted comments to new built-in images
-#
-#     Revision 1.16  2002/02/21 00:12:19  jongfoster
-#     Modifying the banner regexps to use long URLS and to autodetect
-#     whether to show a logo or a transparent GIF, based on actionsfile
-#     setting.
-#
-#     Revision 1.15  2001/12/28 23:54:20  steudten
-#     Fix for feature Req #495374: http-equiv problem
-#
-#     Revision 1.14  2001/12/09 18:55:11  david__schmidt
-#     Updated CODE_STATUS to beta, commented out microsuck line in re_filterfile
-#     for 2.9.10 beta
-#
-#     Revision 1.13  2001/10/13 13:11:20  joergs
-#     Fixed WebBug filter.
-#
-#     Revision 1.12  2001/10/07 15:46:42  oes
-#     Followed Guy's proposal to change the document.cookie job
-#
-#     Revision 1.11  2001/09/21 12:34:00  joergs
-#     Added filter to replace "Nimda" code by a warning.
-#
-#     Revision 1.10  2001/07/20 11:04:26  oes
-#     Added Rodneys javascript cookie filter
-#
-#     Revision 1.9  2001/07/13 14:03:48  oes
-#     Elimiated yet another bug in the banner-by-size jobs. Shame on me!
-#
-#     Revision 1.8  2001/06/29 13:34:00  oes
-#     - Added explanation for U and T options
-#     - Added hint on image replacement by CGI call
-#     - Fixed bug in banner-by-size jobs
-#
-#     Revision 1.7  2001/06/19 14:21:56  oes
-#     Fixed microsuck line
-#
-#     Revision 1.6  2001/06/09 14:01:57  swa
-#     header. cosmetics. default: no messing ala microsuck.
-#