X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.filter;h=db81aecab29e782916ed5552a258c252256ede80;hb=e1a5911ec4ffee093da8352b1b6973d40b322f77;hp=8a0ac5f05327cd32e5a37063a7bdbb3c50d4c5dd;hpb=1eded09a21258417976c822f12cf92da2de8c2d8;p=privoxy.git

diff --git a/default.filter b/default.filter
index 8a0ac5f0..db81aeca 100644
--- a/default.filter
+++ b/default.filter
@@ -2,11 +2,11 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.51 2007/11/04 16:15:11 fabiankeil Exp $
+#  $Id: default.filter,v 1.60 2008/04/26 10:36:41 fabiankeil Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
-#  Copyright   :  Written by and Copyright (C) 2001 - 2007 the
+#  Copyright   :  Written by and Copyright (C) 2001-2008 the
 #                 Privoxy team. http://www.privoxy.org/
 #
 # We value your feedback. However, to provide you with the best support,
@@ -293,7 +293,7 @@ s@<a\s+href\s*=\s*(['"]?)([^>\1\s]*?(?:\
   adclick                             # See www.dn.se \
 | advert                              # see dict.leo.org \
 | atwola\.com/(?:link|redir)          # see www.cnn.com \
-| /jump/                              # redirs for doublecklick.net ads \
+| doubleclick\.net/jump/              # redirs for doublecklick.net ads \
 | counter                             # common \
 | (?<!&type=)tracker                  # (&type=tracker is used in sf's project statistics) \
 | adlog\.pl                           # see sf.net \
@@ -596,9 +596,9 @@ FILTER: yahoo CSS-based block for Yahoo text ads. Also removes a width limitatio
 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,\
- \#ks-ypn-ads {display: none !important;}\n\
- \#yschpri, \#yschweb {width: 100% !important; max-width: 100% !important;}\n\
+ \#yschanswr, .yschftad, .yschspn, .yschspns, \#ygrp-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\
  \#yschqcon, \#yschtg {width: auto !important; /* No useless horizontal scrollbar please */}\n\
 </style>\n$0@
 
@@ -612,25 +612,19 @@ FILTER: msn CSS-based block for MSN text ads. Also removes tracking URLs and a w
 
 s@</head>@<style type="text/css">\n\
  /* Style sheet inserted by Privoxy's msn filter. */\n\
- .msn_ads {display: none !important;}\n\
- \#results, .flank, .results_area_flank, .results_area_stroke, .SearchSection .not\
- {width: 99% /*!important*/; min-width: 99% !important;\
+ .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\
+.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\
- /* Make continue links harder to miss */\n\
- \#pagination_bottom a {padding: .3em .5em .3em .5em; border: 1px solid \#e6e6e6;}\n\
- \#pagination_bottom li, \#pagination_bottom li .selected, li .nextPage \
- {margin: 0 !important; cursor: auto; border: none; padding:.1em;}\n\
- \#pagination_bottom li .prevPage {padding-right: 1.5em !important;}\n\
- \#pagination_bottom li .selected {border: none;}\n\
- .selected a {background-color: \#d2eaf6; border: 1px solid \#b7d8ee;}\n\
  /* Remove "suggestions". They are next to worthless but partly overlap with the search results */\n\
- .suggestion, \#nys_right {clear: both; display:none;}\n\
+ .suggestion, \#nys_right, \#nys {clear: both; display:none;}\n\
+ \#content {padding-right: 0;}\n\
  </style>\n$0@
 s@(<div[^>]*) id=(["']?)ads_[^\2]*\2@$1 class="msn_ads"@Uig
 s@(<a[^>]*href=\")http://g.msn.com/.*\?(http://.*)(&amp;&amp;DI=.*)(\")@$1$2$4@Ug
 s@(<a[^>]*)gping=\".*\"@$1 title="URL cleaned up by Privoxy's msn filter"@Ug
-s@<div id=\"ar\">(<h2>Sponsored sites</h2>)@<div class="msn_ads">$1@
-s@(</script><div) id=\"at\"@$1 class="msn_ads"@
 
 #################################################################################
 #
@@ -641,6 +635,9 @@ s@(</script><div) id=\"at\"@$1 class="msn_ads"@
 #           appear to early or not at all and as fixing this would require a browser
 #           that understands background-size (CSS3), they are removed instead.
 #
+#           When applied to feeds, it removes comment titles that
+#           only contain the beginning of the actual comment.
+#
 #################################################################################
 FILTER: blogspot Cleans up some Blogspot blogs. Read the fine print before using this.
 
@@ -659,6 +656,8 @@ s@<body.*(?:<div id="space-for-ie"></div>|(<div id="(?:content|wrap4|wrapper)))@
 s@(<div style=\"[^\"]*width:)30em@$1 100%@
 s@background:url\(\"http://www.blogblog.com/rounders[^\"]*\"\).*;@/*$0*/@Ug
 s@(background:\#[a-f\d]{3})( url\(\"http://www.blogblog.com/rounders[^\"]*\"\).*;)@$1 ;/*$2*/@Ug
+# Do the feed filtering magic as described above.
+s@<title\s+type=\'text\'>([^\s]*).*?\.\.\.</title>\s*(<content type=\'html\'>\1)@$2@ig
 
 #################################################################################
 #
@@ -728,7 +727,7 @@ s@^((?:Referer|Host):\s*(?:https?://)?[^/]*)\.[^\./]*?\.exit@$1@i
 SERVER-HEADER-FILTER: less-download-windows Prevent annoying download windows for content types the browser can handle itself.
 
 s@^Content-Disposition:.*filename=(["']?).*\.(png|gif|jpe?g|diff?|d?patch|c|h|pl|shar)\1.*$@@i
-s@^(Content-Type:)\s*(?:message/(?:news|rfc822)|text/x-.*|application/x-sh)\s*@$1 text/plain@i
+s@^(Content-Type:)\s*(?:message/(?:news|rfc822)|text/x-.*|application/x-sh(?:\s|$))\s*@$1 text/plain@i
 
 #################################################################################
 #
@@ -797,12 +796,12 @@ s@^User-Agent:.*@$0@i
 
 #################################################################################
 #
-# content-type: Tags the request with the content type declarded by the server.
+# content-type: Tags the request with the content type declared by the server.
 #
 #################################################################################
-SERVER-HEADER-TAGGER: content-type Tags the request with the content type declarded by the server.
+SERVER-HEADER-TAGGER: content-type Tags the request with the content type declared by the server.
 
-s@^Content-Type:\s*([^;]*).*@$1@i
+s@^Content-Type:\s*([^;]+).*@$1@i
 
 #################################################################################
 #
@@ -831,6 +830,43 @@ s@^X-Privoxy-Control:.*@@i
 #
 #  Revisions   :
 #     $Log: default.filter,v $
+#     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.
@@ -1195,7 +1231,3 @@ s@^X-Privoxy-Control:.*@@i
 #     Revision 1.6  2001/06/09 14:01:57  swa
 #     header. cosmetics. default: no messing ala microsuck.
 #
-#
-# 
-
-