final cleanup

2009-12-23 12:35:42 +13:00 · 2009-12-23 12:35:42 +13:00 · 077dbcfc61
commit 077dbcfc61
parent 3a31c45e81
5 changed files with 39 additions and 75 deletions
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@ -133,6 +133,7 @@
 //jsads.
 //nsads.
 /?op=advertising_
+/abmw.aspx?
 /ADFlashes/*
 /ADPictures/*
 /ADSAdClient31.dll?
@ -386,6 +387,7 @@
 /amazon/iframeproxy-
 /amazon/widget/*
 /annonse/*
+/annonser/*
 /anti-adblock/css/*
 /api/ads/*
 /app/bbccom/*
@ -431,10 +433,12 @@
 /bannerview.php?
 /bannerwerbung/*
 /banniere
+/bansrc/*
 /beacon/?
 /bigtopl.swf
 /bilder/anzeige
 /bilder/promo
+/bin-layer.
 /bizbannerre
 /blogads
 /bnr.php?
@ -479,6 +483,7 @@
 /doubleclick.php
 /doubleclickcontainer.aspx?
 /drawad.php?
+/ecom/failsafe/*
 /emailads/*
 /eshopoffer.asp
 /event.ng/Type
@ -581,6 +586,7 @@
 /jserver/random
 /jserver/site
 /jsp/pcwFrame.jsp?
+/kmp_iframe_
 /layer-ads.
 /layer-advert-
 /layer.php?bid=
@ -761,6 +767,8 @@
 /webads/*
 /webads_
 /werbung_
+/werbung/*
+/WerbeBanner/*
 /wpAds/iframe.php?
 /www/delivery/*
 /www/skdelivery/*
@ -1994,7 +2002,7 @@ affiliateBannerShow.aspx?
 ||click.absoluteagency.
 ||click.dtiserv2.com^$third-party
 ||clickz.lonelycheatingwives.com^$third-party
-||clickzs.com^^$third-party
+||clickzs.com^$third-party
 ||closepics.com/media/banners/
 ||content.liveuniverse.com^$third-party
 ||cp.intl.match.com^$third-party
@ -2938,16 +2946,13 @@ size=468x60|
 ||yes-messenger.com^$third-party
 ||vorratsdatenspeicherung.de/images/Akvs
 ||admigo.ru^$third-party
-/bansrc/*
 ||box.shopoon.fr^$third-party
 ||boksy.onet.pl^
 ||blogvertising.pl^$third-party
 ||oper.ru/data/rennabs/
 ||direct.quasir.info^
 ||info.clipta.com^$third-party
-/ecom/failsafe/*
 ||kinotraff.ru^$third-party
-/kmp_iframe_
 ||medialand.relax.ru^$third-party
 ||media-click.ru^$third-party
 ||mixmarket.biz/show/
@ -2957,27 +2962,9 @@ size=468x60|
 ||vas.ppro.de^$third-party
 ||pub.motion-twin.com^
 ||lapi.ebay.com^
-http://audit.*/cgi-bin/*
-http://storage.trafic.*
-http://xban.*
-*espotting.com*
-*cliccabanner*
-*/annonser/*
-*/abmw.aspx*
-*/bin-layer.*
-*/bilder/banner/*
-*/bn.profiwin.de/*
-*/werbung/*
-*/WerbeBanner/*
-*ads4u.nl/*
-*adward.ru/*
-*adlink.de/*
-*allsponsor.de/*
-*si-net.se/*
-*s.clx.ru/*
-*topseek.de/*
-*webex.ru/*
-http://netstorage.discovery.com/ads/*
+||xban.walla.co.il^$third-party
+||ads4u.nl^$third-party
+||netstorage.discovery.com/ads/
 ! Whitelist
@@.inspire.net.nz/
@@://192.168.1.
@ -2985,15 +2972,15 @@ http://netstorage.discovery.com/ads/*
@@://192.168.0.
@@://10.1.1.
@@://media.tomshardware.
-@@*coremetrics$domain=qvc.com
+@@coremetrics$domain=qvc.com
@@://movies.flabber.
-@@.kinagrannis.com/images/banner/*
+@@|kinagrannis.com/images/banner/
@@|http://as.webmd.com/html.ng/*$domain=webmd.com,object_subrequest
@@|http://video.economist.com/AdFinder.jsp?*
@@/adsense.$domain=adsense.blogspot.com|thecodingstudio.com
-@@*/economist.com/video/*
+@@/economist.com/video/*
@@|http://omnikool.discovery.com/*
-@@*/banner_ad*$domain=lavasoft.com
+@@/banner_ad$domain=lavasoft.com
@@|http://pagead2.$domain=revver.com
@@|http://images.apple.com/quicktime/*$background
@@|http://direct.fairfax.com.au/*$domain=smh.com.au,script
@ -3010,16 +2997,16 @@ http://netstorage.discovery.com/ads/*
@@.akamai.*/videos/*
@@_sx.ads/demand.five.tv/$domain=demand.five.tv,object_subrequest
@@_lx.ads/www.morningstar.com/video/$object_subrequest
-@@*/advertisem$script,domain=mircscripts.org|newsarama.com|tvnz.co.nz|superfundo.org
+@@/advertisem$script,domain=mircscripts.org|newsarama.com|tvnz.co.nz|superfundo.org
@@.mlb.com/shared/flash/ads/video/*
@@.nick.com/js/ads/ad.js
-@@*/webtrends$domain=usps.com|canon.com
+@@/webtrends$domain=usps.com|canon.com
@@.gstatic.com/images?$domain=images.google.com
@@://yellow.co.nz/rs/omniture.js
-@@*/__utm.js*$domain=addons.mozilla.org
-@@*/www/delivery/*$domain=video.belga.be|submarino.com.br|japantimes.co.jp
-@@*/counter.php$domain=games-tv.ru
-@@*/counter.js$domain=timeanddate.com
+@@/__utm.js$domain=addons.mozilla.org
+@@/www/delivery/*$domain=video.belga.be|submarino.com.br|japantimes.co.jp
+@@/counter.php$domain=games-tv.ru
+@@/counter.js$domain=timeanddate.com
@@.com/ads.js?$domain=novamov.com
@@.microsoft.com/windows/Framework/js/omniture/*
@@|http://ads.us.e-planning.net*/VideoBanner?*
@ -3029,8 +3016,8 @@ http://netstorage.discovery.com/ads/*
@@|http://ad.doubleclick.net/adj/$domain=ponged.com,script
@@|http://ad.doubleclick.net/adj/gametrailers.mtvi/*
@@|http://metrics.$domain=howstuffworks.com,image
-@@http://video.on.nytimes.com/AdFinder
-@@http://ad.doubleclick.net/adj/*video/*
+@@|http://video.on.nytimes.com/AdFinder
+@@|http://ad.doubleclick.net/adj/*video/*
@@|http://ads.belointeractive.*/video/*@Overlay
@@|http://ad.doubleclick.net/adj/ifilm.mtvi/*
@@|http://rotator.adjuggler.com/*$domain=videodetective.com
@ -3050,9 +3037,8 @@ http://netstorage.discovery.com/ads/*
@@i.total-media.net/*$domain=winwin.co.il
@@.wikia.nocookie.net/*
@@.cpalead.com/*$domain=free-space.net|lookthis.org|rsengine.net|youserials.com|runescapehack.net|mastahacks.com|runescapecheat.net|wtso.net|latest-episode.net,script,subdocument
-@@*/adframe.js$domain=EQ2Flames.com|forum.ppcgeeks.com|houseloanmarket.com
+@@/adframe.js$domain=EQ2Flames.com|forum.ppcgeeks.com|houseloanmarket.com
@@mail.live.com/
-@@*/yellow.co.nz/img/pixel_trans.gif
@@|http://*$script,domain=lansingstatejournal.com|burlingtonfreepress.com|press-citizen.com|thetimesherald.com|poughkeepsiejournal.com|coshoctontribune.com|courierpostonline.com|app.com|fdlreporter.com|statesmanjournal.com|mydesert.com|visaliatimesdelta.com
@@|http://video.*user.madbanner.ru/*
@@|http://ads.yimg.com/*videoadmodule*.swf$object_subrequest
@ -3758,6 +3744,7 @@ http://netstorage.discovery.com/ads/*
 ##.group.ads
 ##.halfPageAd
 ##.hd_advert
+##.header_ad
 ##.headerAdvert
 ##.headerTextAd
 ~associatedcontent.com##.header_ad_center
--- a/fanboy-adblocklist-stats.txt
+++ b/fanboy-adblocklist-stats.txt
@ -1394,16 +1394,16 @@ webstatisztika
 ||ystat.net^$third-party
 ||z.about.com/px/?
 ||zirve100.com/Counter
-@@*/analytics.js$domain=nymag.com
-@@*/clickheat.*$domain=about-australia.com
-@@*/counter.php$domain=games-tv.ru
-@@*/mi/ywa.js$domain=nydailynews.com
-@@*/omniture*$domain=yellow.co.nz|ireport.com|sbs.com.au
-@@*/omniunih.js$domain=www.aol.com
-@@*/pixel.gif$domain=testeo.de|cool-wallpaper.us|cdartdisplay.com|seeklearning.com.au
-@@*/tracker.js$domain=imba.hu|wikia.com
-@@*/tracker.php?$domain=blog.koldcast.tv
-@@*/webtrends$domain=usps.com|canon.com|logitech.com|nydailynews.com
+@@/analytics.js$domain=nymag.com
+@@/clickheat.$domain=about-australia.com
+@@/counter.php$domain=games-tv.ru
+@@/mi/ywa.js$domain=nydailynews.com
+@@/omniture$domain=yellow.co.nz|ireport.com|sbs.com.au
+@@/omniunih.js$domain=www.aol.com
+@@/pixel.gif$domain=testeo.de|cool-wallpaper.us|cdartdisplay.com|seeklearning.com.au
+@@/tracker.js$domain=imba.hu|wikia.com
+@@/tracker.php?$domain=blog.koldcast.tv
+@@/webtrends$domain=usps.com|canon.com|logitech.com|nydailynews.com
@@.popsci.*/omniture/*
@@/tii_ads.js$domain=ew.com|people.com
@@|http://dw.com.com/js/dw.js$domain=tv.com
@ -1413,3 +1413,4 @@ webstatisztika
@@|http://support.gateway.*/OMNITURE/*
@@|http://tracking2.vindicosuite.com/*$domain=filefront.com|moddb.com
@@|http://www.seek.*/omniture*$script
+@@||yellow.co.nz/img/pixel_trans.gif
--- a/iron/adblock-beta.ini
+++ b/iron/adblock-beta.ini
@ -4233,27 +4233,15 @@ http://annonse.
 http://pub.motion-twin.com/
 http://lapi.ebay.
 http://medialand.relax.ru/code?
-http://storage.trafic.
 http://xban.
-espotting.com
-cliccabanner
 /annonser/
 /abmw.aspx
 /bin-layer.
-/bilder/banner/
-http://bn.profiwin.de/
 /werbung/
 /WerbeBanner/
 adshop.ru/
 ads4u.nl/
-adward.ru/
-adlink.de/
 bantex.ru/
-allsponsor.de/
 facebook.com/beacon/
-si-net.se/
-s.clx.ru/
-topseek.de/
-webex.ru/
 .pricegrabber.com/export_feeds.
 .pricegrabber.com/cb_table.
--- a/opera/fanboy-adblocklist-elements-v3.css
+++ b/opera/fanboy-adblocklist-elements-v3.css
@ -99,7 +99,7 @@
 .left-ads,.footer-ads,#adcolumnwrapper,.adSummary,#download_ads,#sliderAdHolder,#adSpot-promobox1,#adSpot-promobox2,#adSpotIsland,#ad_right,#ad_bottom,
 #box_articlead,.advert-article-bottom,.foot-advertisement,.advert_note,.MD_adZone,#promoAds,.cg_ad_slug,#mid_mpu,#front_mpu,#ad-tower,#ad-placard,.advertCaption,
 #ad-tower1,#module-google_ads,.spon-links,.ad-top,.right-top-ad,.adLabel,#ad-target-Leaderbord,#adsensetopplay,.advertisement-text,#eshopad-728x90,.ad_right,
-#ad_banner_1,.g-adblock3,#g-adblock2,
+#ad_banner_1,.g-adblock3,#g-adblock2,.header_ad,

 /* adult-list */
 #im_popupDiv,#AFF_popup,#floatyContent,.adbckgrnd,
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@ -4323,26 +4323,14 @@ http://annonse.*
 http://pub.motion-twin.com/*
 http://lapi.ebay.*
 http://audit.*/cgi-bin/*
-http://storage.trafic.*
 http://xban.*
-*espotting.com*
-*cliccabanner*
 */annonser/*
 */abmw.aspx*
 */bin-layer.*
-*/bilder/banner/*
-*/bn.profiwin.de/*
 */werbung/*
 */WerbeBanner/*
 *adshop.ru/*
 *ads4u.nl/*
-*adward.ru/*
-*adlink.de/*
-*allsponsor.de/*
 *facebook.com/beacon/*
-*si-net.se/*
-*s.clx.ru/*
-*topseek.de/*
-*webex.ru/*
 *.pricegrabber.com/export_feeds.*
-*.pricegrabber.com/cb_table.*e
+*.pricegrabber.com/cb_table.*