optimise v4

2010-10-02 22:14:03 +13:00 · 2010-10-02 22:14:03 +13:00 · f2b04db33f
commit f2b04db33f
parent e4c1716868
3 changed files with 149 additions and 144 deletions
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: Z3bmuLecIY7ohl54p5TdLg
+! Checksum: kHbImuEQZ7WCidwmyqlfsg
 ! Fanboy's Adblock list
 ! Updated: 2 Oct 2010
 ! This list expires after 4 days
@ -2656,37 +2656,37 @@ server/CCID
 ,468x60;
 ,728x90,
 ,970x90;
-120-600.gif
+-120-600.gif|
 -120x240.
 -120x300.
 -120x400.
-120x60.gif
+-120x60.gif|
 -120x600-
 -120x600.
-120x600c
+-120x600c.
 -125x40-
-130x600
+-130x600px.
 -160-600.
 -160x120_
 -160x160.
 -160x400-
 -160x600-
 -160x600.
-160X600b
+-160X600b.
 -180x250.
 -180x60.
 -184x100.
 -234x60-
-235x58p
+-235x58px.
 -235x60-
 -250x250-
 -260x300.
 -300-250.
 -300x100.
-300x200.gif
+-300x200.gif|
 -300x250-
 -300x250.
-316x200.swf
+-316x200.swf|
 -337x281-
 -360x110.
 -468x060
@ -2732,7 +2732,7 @@ server/CCID
 /125x400/*
 /125x600-
 /125x600_
-/150-500.gif
+/150-500.gif|
 /150_500.
 /150x200-
 /150x300_
@ -2740,7 +2740,7 @@ server/CCID
 /160-600-
 /160_600.
 /160_600_
-/160x200.jpg
+/160x200.jpg|
 /160x400-
 /160x400_
 /160x600
@ -2755,9 +2755,9 @@ server/CCID
 /232x30_
 /234x60/*
 /240x350_
-/300-bann
+/300-banner.
 /300x150_
-/300x60.jpg
+/300x60.jpg|
 /300x60_
 /300x90_
 /308x385_
@ -2775,33 +2775,36 @@ server/CCID
 /468-60-
 /468-60.
 /468-60_
-/468-bann
+/468-banner.
 /468_60.
 /468_60_
-/468_60v
+/468_60v3.
 /468_80.
-/468_80p
-/468by60
-/468x060
-/468x280
+/468_80psj.
+/468by60logo.
+/468x060.
+/468x060_
+/468x280_
+/468x280.
 /468x60-
 /468x60.
 /468x60/*
 /468x60_
-/468x60a
-/468x60b
-/468x60l
-/468x60p
-/468X60t
-/468x60w
+/468x60a.
+/468x60a_
+/468x60b.
+/468x60lock.
+/468x60painless5.
+/468x60white2.
 /468x80-
 /468x80/*
 /468x80_
-/468x80b
-/468x80g
-/470x030
+/468x80b.
+/468x80g.
+/470x030_
 /475x150-
-/480x030
+/480x030_
+/480x030.
 /496_98_
 /600_120_
 /600_90_
@ -2827,13 +2830,15 @@ server/CCID
 /728x90/*
 /728x90?
 /728x90_
-/728x90b
-/728x90c
+/728x90blue.
+/728x90B/*
+/728x90B.
 /728x90D
-/728x90F
-/728x90n
-/750-100
-/760x120
+/728x90Footer.
+/728x90n6.
+/750-100.
+/760x120v3.
+/760x120_
 /760x90_
 /768x90.
 /80x468_
@ -2856,88 +2861,102 @@ server/CCID
 /images/336x280
 /img/468_60
 /img/728_90
-100x200.gif
-120x500.gif
-120x600.gif
-120x600.htm
-120x600.jpg
-120x600.png
-120x600.swf
-125x125.gif
-125x600.gif
-125x600.swf
-133x394.gif
-160x300.gif
-160x600.gif
-160x600.htm
-160x600.jpg
-160x600.php
-160x600.png
-160x600.swf
-160x6001
-175x175.gif
-180x300.gif
-180x600-
+100x200.gif|
+120x500.gif|
+120x600.gif?
+120x600.gif|
+120x600.htm|
+120x600.html|
+120x600.jpg|
+120x600.png|
+120x600.swf?
+120x600.swf|
+125x125.gif|
+125x600.gif|
+125x600.swf?
+125x600.swf|
+133x394.gif|
+160x300.gif|
+160x600.gif|
+160x600.htm|
+160x600.html|
+160x600.jpg|
+160x600.php?
+160x600.php|
+160x600.png|
+160x600.swf?
+160x600.swf|
+160x6001.jpg|
+175x175.gif|
+180x300.gif|
+180x600-1.jpg|
 186x29.swf?
-234x60.gif
-246x120.swf
-250x210.jpg
-250X250.swf
+234x60.gif|
+246x120.swf|
+250x210.jpg|
+250X250.swf|
 3/ad300x145.
-300x250.gif
-300x250.htm
-300x250.jpeg$domain=~pics.tata.ru
-300x250.jpg$domain=~mydamnchannel.com|~fanhouse.com
+300x250.gif|
+300x250.htm|
+300x250.html|
+300x250.jpeg|$domain=~pics.tata.ru
+300x250.jpg|$domain=~mydamnchannel.com|~fanhouse.com
 300x250.php|
-300x250.png
-300x250.swf
-300x250ad
+300x250.png|
+300x250.swf?
+300x250.swf|
 300x250B.swf
-300x60.gif
-302x52.swf
-316x250.swf
-320x250_
-336x280.gif
-336x280.jpg
-450x55.jpg
-460x70.jpg
-468-60.gif
-468-60.swf
-46860.gif
-468_60.gif
-468_60_1
-468x060.
-468x060_
-468x100_
-468x60.gif
-468x60.htm
-468x60.jpg
-468x60.php
-468x60.swf
-468x60_1
-468x60_2.
-468x60ad
-468x60banner
-468x60nologo.swf
-468x80.gif
-470x60.gif
-470x60.jpg
-470x60.swf
-480x80.jpg
-486x60.js
-522x62.jpg
-700200.jpg
-700_200.gif
-700_200.jpg
-700_200_0
-700x200.gif
-728x290.gif
-728x90.gif
-728x90.htm
-728x90.jpg
-728x90.php
-728x90.png
-728x90.swf
+300x60.gif|
+302x52.swf|
+316x250.swf|
+_320x250_
+336x280.gif|
+336x280.jpg|
+450x55.jpg|
+460x70.jpg|
+468-60.gif|
+468-60.swf?
+468-60.swf|
+46860.gif|
+468_60.gif|
+468x60_1.gif|
+_468x060.
+-468x060_
+_468x100_
+468x60.gif|
+468x60.html
+468x60.htm|
+468x60.jpg|
+468x60.php?
+468x60.php|
+468x60.swf?
+468x60.swf|
+_468x60_1.
+_468x60_2.
+_468x60ad.
+468x80.gif|
+470x60.gif|
+470x60.jpg|
+470x60.swf|
+470x60.swf?
+480x80.jpg|
+486x60.js|
+522x62.jpg|
+700200.jpg|
+700_200.gif|
+700_200.jpg|
+700_200_02.
+700x200.gif|
+728x290.gif|
+728x90.gif|
+728x90.htm|
+728x90.html|
+728x90.jpg|
+728x90.php?
+728x90.php|
+728x90.png|
+728x90.swf?
+728x90.swf|
 728x90_2.
 750x80.swf
 750x90.gif
@ -3008,16 +3027,16 @@ _120x480.
 _120x600-
 _120x600.
 _120x600_
-_120x600a
+_120x600a.
 _120x60_
-_120x800A
+_120x800A.
 _122x22.
 _124x55_
 _125x117.
 _125x600_
 _130x280_
 _140x140.
-_148x154
+_148x154a.
 _150_250.
 _150x105_
 _150x90.
@ -3030,8 +3049,8 @@ _160x300_
 _160x350.
 _160x400.
 _160x600
-_180-500.swf
-_180x150.png
+_180-500.swf|
+_180x150.png|
 _180x150_*?
 _180x300_
 _180x450_
@ -3044,11 +3063,12 @@ _250x90_
 _251x190.
 _280x40_
 _295x89_
-_300_200.gif
+_300_200.gif|
 _300_250
 _300_60_
 _300x160_
-_300x200.htm
+_300x200.htm|
+_300x200.html|
 _300x250-
 _300x250_
 _300x250a_
@ -3060,7 +3080,6 @@ _300x60_
 _300x75_
 _300x80.
 _308x100.
-_310x_140
 _323x120_
 _336x120.
 _336x280.
@ -3086,7 +3105,9 @@ _465x110_
 _468_60.
 _468_60_
 _468_80.
-_468x060
+_468x060_
+_468x060-
+_468x060.
 _468x100.
 _468x120.
 _468x60-
@ -3107,7 +3128,7 @@ _500x440.
 _501x60.
 _507x45.
 _522x62_
-_533X106.jpg
+_533X106.jpg|
 _540_70.
 _540_70_
 _550x150.
@ -3130,7 +3151,7 @@ _700_200_
 _720_90.
 _720x90.
 _728-90_
-_72890.jpg
+_72890.jpg|
 _728_90.
 _728by90_
 _728x-90.
@ -3160,20 +3181,12 @@ _936x60.
 _960_90.
 _970x30_
 _leftx280_
-ads/468x60
-anner/728x
-banner-468x
-banner300x
-banner_468.
-d468x60-
 size=468x60|
-sz=160x200
-sz=47x47;
 !
 !---------- Dimension Whitelists ----------
 !
-@@-160x160.jpg$domain=parentsconnect.com
-@@-300x250.jpg$domain=nypost.com|motherjones.com
+@@-160x160.jpg|$domain=parentsconnect.com
+@@-300x250.jpg|$domain=nypost.com|motherjones.com
@@/125x125/*$domain=bigsoccer.com
@@/728x90/*$domain=weather.weatherbug.com
@@=728x90&$domain=pkra.com,subdocument
--- a/iron/adblock-beta.ini
+++ b/iron/adblock-beta.ini
@ -1,5 +1,5 @@
 # Fanboy's Adblock list (Iron-Chrome)
-# Checksum: GgPkXC6Wt6Yxfa9emmtL/A
+# Checksum: p/Arx6H/3k91NH5mn+MS/A
 # Updated: 2 Oct 2010
 # License: http://creativecommons.org/licenses/by/2.5
 # Contact: fanboyadblock@fanboy.co.nz  http://fanboy.co.nz/adblock
@ -2735,7 +2735,6 @@
 300x250.png
 300x250.swf
 300x250.swf?
-300x250ad
 300x250B.swf
 300x60.gif
 302x52.swf
@ -2763,8 +2762,6 @@
 468x60_1
 468x60_2.
 468x60ad
-468x60banner
-468x60nologo.swf
 468X80-
 468X80.
 468x80.gif
@ -2915,7 +2912,6 @@ _300x60_
 _300x75_
 _300x80.
 _308x100.
-_310x_140
 _323x120_
 _323x120_
 _336x120.
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@ -1,5 +1,5 @@
 # Fanboy's Adblock list (Opera)
-# Checksum: 54SGkXOk2Z6PYrG+23M7QQ
+# Checksum: D50sP4yI8jjYZFO+I+Fmfw
 # Updated: 2 Oct 2010
 # License: http://creativecommons.org/licenses/by/3.0/
 # Contact: fanboyadblock@fanboy.co.nz  http://fanboy.co.nz/adblock
@ -3530,7 +3530,6 @@ https://view.atdmt.*view/*
 *300x250.png
 *300x250.swf
 *300x250.swf?*
-*300x250ad*
 *300x250B.swf
 *300x60.gif
 *302x52.swf
@ -3558,8 +3557,6 @@ https://view.atdmt.*view/*
 *468x60_1*
 *468x60_2.*
 *468x60ad*
-*468x60banner*
-*468x60nologo.swf
 *468X80-*
 *468X80.*
 *468x80.gif
@ -3704,7 +3701,6 @@ https://view.atdmt.*view/*
 *_300x75_*
 *_300x80.*
 *_308x100.*
-*_310x_140*
 *_323x120_*
 *_336x120.*
 *_336x280.*