implement $popup

2011-10-05 22:27:48 +13:00 · 2011-10-05 22:27:48 +13:00 · 4e03613470
commit 4e03613470
parent fa4b2f023b
10 changed files with 152 additions and 152 deletions
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: 0HpOAZGfFKUC3PnhrwJx/w
+! Checksum: jyiXnEGeb2J+F5LreKOmEg
 ! Fanboy's Adblock list
 ! Updated: 5 Oct 2011
 ! This list expires after 5 days
@ -3777,45 +3777,45 @@ images/ads/*
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||888poker.com^$other
-||888promos.com^$other
-||allslotscasino.com^$other
-||angege.com^$other
-||bidvertiser.com^$other
-||blinko.es^$other
-||blinkogold.es^$other
-||casino.com^$other
-||clicksor.com^$other
-||ero-advertising.com^$other
-||eurogrand.com^$other
-||europacasino.com^$other
-||exoplanetwar.com^$other
-||greatbranddeals.com^$other
-||groupon.com.au^$other
-||hidemyass.com^$other
-||homecareerforyou1.info^$other
-||isogames-download.com^$other
-||isohunt.com^$other
-||rapidown.in^$other
-||megaclick.com^$other
-||mobileraffles.com^$other
-||n-mobile.net^$other
-||onlinecashmethod.com^$other
-||partypoker.com^$other
-||pokerstrategy.com^$other
-||popads.net^$other
-||ringtonepartner.com^$other
-||sense.co.il^$other
-||sharecash.org^$other
-||statstrackeronline.com^$other
-||surveysforgifts.org^$other
-||the-consumer-reporter.org^$other
-||therewardsurvey.com^$other
-||uploaded.to^$other
-||videobb.com^$other
-||weeklyprizewinner.com-net.info^$other
-||youtoo.be^$other
-||zshare.net^$other
+||888poker.com^$other,popup,image,~image
+||888promos.com^$other,popup,image,~image
+||allslotscasino.com^$other,popup,image,~image
+||angege.com^$other,popup,image,~image
+||bidvertiser.com^$other,popup,image,~image
+||blinko.es^$other,popup,image,~image
+||blinkogold.es^$other,popup,image,~image
+||casino.com^$other,popup,image,~image
+||clicksor.com^$other,popup,image,~image
+||ero-advertising.com^$other,popup,image,~image
+||eurogrand.com^$other,popup,image,~image
+||europacasino.com^$other,popup,image,~image
+||exoplanetwar.com^$other,popup,image,~image
+||greatbranddeals.com^$other,popup,image,~image
+||groupon.com.au^$other,popup,image,~image
+||hidemyass.com^$other,popup,image,~image
+||homecareerforyou1.info^$other,popup,image,~image
+||isogames-download.com^$other,popup,image,~image
+||isohunt.com^$other,popup,image,~image
+||rapidown.in^$other,popup,image,~image
+||megaclick.com^$other,popup,image,~image
+||mobileraffles.com^$other,popup,image,~image
+||n-mobile.net^$other,popup,image,~image
+||onlinecashmethod.com^$other,popup,image,~image
+||partypoker.com^$other,popup,image,~image
+||pokerstrategy.com^$other,popup,image,~image
+||popads.net^$other,popup,image,~image
+||ringtonepartner.com^$other,popup,image,~image
+||sense.co.il^$other,popup,image,~image
+||sharecash.org^$other,popup,image,~image
+||statstrackeronline.com^$other,popup,image,~image
+||surveysforgifts.org^$other,popup,image,~image
+||the-consumer-reporter.org^$other,popup,image,~image
+||therewardsurvey.com^$other,popup,image,~image
+||uploaded.to^$other,popup,image,~image
+||videobb.com^$other,popup,image,~image
+||weeklyprizewinner.com-net.info^$other,popup,image,~image
+||youtoo.be^$other,popup,image,~image
+||zshare.net^$other,popup,image,~image
 !     
 !---------- DoubleClick Whitelists ----------
 !     
@ -5804,20 +5804,20 @@ _popupunder.
 !
 !---------- Adult Popups (Adblock Plus Pop-up Addon required) ----------
 !
-||33traffic.com^$other
-||3questionsgetthegirl.com^$other
-||888.com^$other
-||adultadworld.com^$other
-||adultfriendfinder.com^$other
-||playgirl.com^$other
-||cam4.com^$other
-||easysexdate.com^$other
-||flirt4free.com^$other
-||livejasmin.com^$other
-||pinkberrytube.com^$other
-||pornerbros.com^$other
-||webcams.com^$other
-||xmatch.com^$other
+||33traffic.com^$other,popup,image,~image
+||3questionsgetthegirl.com^$other,popup,image,~image
+||888.com^$other,popup,image,~image
+||adultadworld.com^$other,popup,image,~image
+||adultfriendfinder.com^$other,popup,image,~image
+||playgirl.com^$other,popup,image,~image
+||cam4.com^$other,popup,image,~image
+||easysexdate.com^$other,popup,image,~image
+||flirt4free.com^$other,popup,image,~image
+||livejasmin.com^$other,popup,image,~image
+||pinkberrytube.com^$other,popup,image,~image
+||pornerbros.com^$other,popup,image,~image
+||webcams.com^$other,popup,image,~image
+||xmatch.com^$other,popup,image,~image
 !     
 !---------- Adult Whitelists ----------
 !     
--- a/firefox-regional/fanboy-adblocklist-chn.txt
+++ b/firefox-regional/fanboy-adblocklist-chn.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: /bey9/jelGmMJXc1dh84uw
+! Checksum: iPQzOecWHzdkDprLC8cJPA
 ! Fanboy's Chinese-addon Adblock list 
-! Updated: 25 Sep 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -351,10 +351,10 @@ _souvv_ads.js
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||ct10000.com^$other
-||gogo.com^$other
-||groupon.com.tw^$other
-||ranwen.com^$other
+||ct10000.com^$other,popup,image,~image
+||gogo.com^$other,popup,image,~image
+||groupon.com.tw^$other,popup,image,~image
+||ranwen.com^$other,popup,image,~image
 !
 ! ---------- 3rd party blocking rules ----------
 !
--- a/firefox-regional/fanboy-adblocklist-esp.txt
+++ b/firefox-regional/fanboy-adblocklist-esp.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: /weqHKzvHx555f4OfB8AAA
+! Checksum: H39Y0bJKg3PTJ2avClHqbw
 ! Fanboy's Spanish/Portuguese Adblock list 
-! Updated: 2 Oct 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -339,7 +339,6 @@ http://adw.
 ||new-down.com^$third-party
 ||nspmotion.com^$third-party
 ||offers.motime.com.br^$third-party
-||partypoker.com^$other
 ||planetup.com^$third-party
 ||pmssrv.mercadolibre.com.mx^$third-party
 ||pmssrv.mercadolibre.com.ve^$third-party
@ -357,50 +356,51 @@ http://adw.
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||123tonosgratis.com^$other
-||12sms.mobi^$other
-||axeso5.com^$other
-||bingoliner.com^$other
-||blinkogold.es^$other
-||cashtrafic.com^$other
-||celldorado.com^$other
-||cinetube.es^$other
-||clubsexy.es^$other
-||clubxvid.com^$other
-||comprechinabr.com^$other
-||curso-distancia-online.com^$other
-||curso-personalshopper.com^$other
-||descargo.co^$other
-||divxonline.info^$other
-||donagabriella.com^$other
-||enterfactory.com^$other
-||flingvibe.com^$other
-||glomobi.com^$other
-||groupalia.com^$other
-||groupon.com.br^$other
-||groupon.es^$other
-||hqdesexo.com^$other
-||hvideorewardsonline.com^$other
-||jazztelenoferta.es^$other
-||lacuerda.net^$other
-||lineadirecta.com^$other
-||mktmobi.com^$other
-||movilium.com^$other
-||mundome.com^$other
-||n-mobile.net^$other
-||pcmegarapido.com^$other
-||protegelink.net^$other
-||reachclic.net^$other
-||ringtonepartner.com^$other
-||socialrewards.co^$other
-||theconsumersurvey.org^$other
-||theconsumerwinner.com^$other
-||trackamg.com^$other
-||travian.cl^$other
-||trivia-mind.es^$other
-||unmillondeutilidades.com^$other
-||urso-personalshopper.com^$other
-||zed.com^$other
+||123tonosgratis.com^$other,popup,image,~image
+||12sms.mobi^$other,popup,image,~image
+||axeso5.com^$other,popup,image,~image
+||bingoliner.com^$other,popup,image,~image
+||blinkogold.es^$other,popup,image,~image
+||cashtrafic.com^$other,popup,image,~image
+||celldorado.com^$other,popup,image,~image
+||cinetube.es^$other,popup,image,~image
+||clubsexy.es^$other,popup,image,~image
+||clubxvid.com^$other,popup,image,~image
+||comprechinabr.com^$other,popup,image,~image
+||curso-distancia-online.com^$other,popup,image,~image
+||curso-personalshopper.com^$other,popup,image,~image
+||descargo.co^$other,popup,image,~image
+||divxonline.info^$other,popup,image,~image
+||donagabriella.com^$other,popup,image,~image
+||enterfactory.com^$other,popup,image,~image
+||flingvibe.com^$other,popup,image,~image
+||glomobi.com^$other,popup,image,~image
+||groupalia.com^$other,popup,image,~image
+||groupon.com.br^$other,popup,image,~image
+||groupon.es^$other,popup,image,~image
+||hqdesexo.com^$other,popup,image,~image
+||partypoker.com^$other,popup,image,~image
+||hvideorewardsonline.com^$other,popup,image,~image
+||jazztelenoferta.es^$other,popup,image,~image
+||lacuerda.net^$other,popup,image,~image
+||lineadirecta.com^$other,popup,image,~image
+||mktmobi.com^$other,popup,image,~image
+||movilium.com^$other,popup,image,~image
+||mundome.com^$other,popup,image,~image
+||n-mobile.net^$other,popup,image,~image
+||pcmegarapido.com^$other,popup,image,~image
+||protegelink.net^$other,popup,image,~image
+||reachclic.net^$other,popup,image,~image
+||ringtonepartner.com^$other,popup,image,~image
+||socialrewards.co^$other,popup,image,~image
+||theconsumersurvey.org^$other,popup,image,~image
+||theconsumerwinner.com^$other,popup,image,~image
+||trackamg.com^$other,popup,image,~image
+||travian.cl^$other,popup,image,~image
+||trivia-mind.es^$other,popup,image,~image
+||unmillondeutilidades.com^$other,popup,image,~image
+||urso-personalshopper.com^$other,popup,image,~image
+||zed.com^$other,popup,image,~image
 !
 ! ---------- Spanish/Portuguese Whitelist Rules ----------
 !
--- a/firefox-regional/fanboy-adblocklist-ind.txt
+++ b/firefox-regional/fanboy-adblocklist-ind.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: tTuQ9sCeYYwlGhTj4uF+6A
+! Checksum: duIRfpvzP+dUzDLPcj+XDA
 ! Fanboy's Indian-addon Adblock list 
-! Updated: 1 Oct 2011
+! Updated: 5 Oct 2011
 ! This list expires after 4 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -153,7 +153,7 @@
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !
-||profile.bharatmatrimony.com^$other
+||profile.bharatmatrimony.com^$other,popup,image,~image
 !
 !---------- Indian Trackers ----------
 !
--- a/firefox-regional/fanboy-adblocklist-ita.txt
+++ b/firefox-regional/fanboy-adblocklist-ita.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: 6xbBAjaInwVis2uuYKhzBA
+! Checksum: 6E8bUTWH9kZf8yjOeyYfsg
 ! Fanboy's Italian-addon Adblock list 
-! Updated: 28 Sep 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -318,16 +318,16 @@ _pubblicita.
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !
-||c-date.it^$other
-||clicks.bestspeedfind.com^$other   
-||firesharing.net^$other
-||gigolom.com^$other
-||groupon.it^$other
-||meetic.it^$other
-||mega-ps3.com^$other
-||partypoker.it^$other
-||ringtonepartner.com^$other
-||travian.it^$other
+||c-date.it^$other,popup,image,~image
+||clicks.bestspeedfind.com^$other,popup,image,~image   
+||firesharing.net^$other,popup,image,~image
+||gigolom.com^$other,popup,image,~image
+||groupon.it^$other,popup,image,~image
+||meetic.it^$other,popup,image,~image
+||mega-ps3.com^$other,popup,image,~image
+||partypoker.it^$other,popup,image,~image
+||ringtonepartner.com^$other,popup,image,~image
+||travian.it^$other,popup,image,~image
 !
 !---------- Italian Trackers ------------
 !
--- a/firefox-regional/fanboy-adblocklist-jpn.txt
+++ b/firefox-regional/fanboy-adblocklist-jpn.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: zd0NqHGRXax5R1C2ph+DFQ
+! Checksum: g9vuWOhSqXTEo4E2tl8NfQ
 ! Fanboy's Japanese-addon Adblock list 
-! Updated: 25 Sep 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -224,9 +224,9 @@ _ds_adtag_
 !
 !---------- Japanese Popups (Adblock Plus Pop-up Addon required) ----------
 !
-||cvh.jp^$other
-||sundayomg.blogspot.com^$other
-||travian.jp^$other
+||cvh.jp^$other,popup,image,~image
+||sundayomg.blogspot.com^$other,popup,image,~image
+||travian.jp^$other,popup,image,~image
 !
 !---------- Japanese Trackers ------------
 !
--- a/firefox-regional/fanboy-adblocklist-pol.txt
+++ b/firefox-regional/fanboy-adblocklist-pol.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: 042rNpZg/lARbQ6WmEJIrg
+! Checksum: B/qmts+JnEeaCyTzSsFhvw
 ! Fanboy's Polish-addon Adblock list 
-! Updated: 3 Oct 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -116,9 +116,9 @@
 !
 !---------- Polish Popups (Adblock Plus Pop-up Addon required) ----------
 !
-||gem.pl^$other
-||wygrywasz.pl^$other
-||eurogrand.com^$other
+||gem.pl^$other,popup,image,~image
+||wygrywasz.pl^$other,popup,image,~image
+||eurogrand.com^$other,popup,image,~image
 !
 !---------- Polish Trackers ------------
 !
--- a/firefox-regional/fanboy-adblocklist-rus-v2.txt
+++ b/firefox-regional/fanboy-adblocklist-rus-v2.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: I+Gv9tfX32NG/WSQJ02ZMA
+! Checksum: 6JWwFwD+N7k9awgG3fYrag
 ! Fanboy's Russian-V2-addon Adblock list 
-! Updated: 1 Oct 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -992,13 +992,13 @@ _reklama.
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||am10.ru^$other
-||gemius.com.ua^$other
-||promo.karosgame.ru^$other
-||qiq.ws^$other
-||rapidzona.com^$other
-||rutor.org^$other
-||vipsoftware.org^$other
+||am10.ru^$other,popup,image,~image
+||gemius.com.ua^$other,popup,image,~image
+||promo.karosgame.ru^$other,popup,image,~image
+||qiq.ws^$other,popup,image,~image
+||rapidzona.com^$other,popup,image,~image
+||rutor.org^$other,popup,image,~image
+||vipsoftware.org^$other,popup,image,~image
 !
 !---------- Russian Trackers/Counters ------------
 !
--- a/firefox-regional/fanboy-adblocklist-tky.txt
+++ b/firefox-regional/fanboy-adblocklist-tky.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: Q1ydnVHanYofOoW+9RNYkA
+! Checksum: wFMXZenSBpQNNS81JD3yVw
 ! Fanboy's Turkish-addon Adblock list 
-! Updated: 30 Sep 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -287,12 +287,12 @@ _reklam_125_
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||bingomingo.com^$other
-||htfilmindir.com^$other
-||iload.to^$other
-||mpornoizle.info^$other
-||notification.travian.com.tr^$other
-||zorgenclik.us^$other
+||bingomingo.com^$other,popup,image,~image
+||htfilmindir.com^$other,popup,image,~image
+||iload.to^$other,popup,image,~image
+||mpornoizle.info^$other,popup,image,~image
+||notification.travian.com.tr^$other,popup,image,~image
+||zorgenclik.us^$other,popup,image,~image
 !
 !---------- Whitelist  ----------
 !
--- a/firefox-regional/fanboy-adblocklist-vtn.txt
+++ b/firefox-regional/fanboy-adblocklist-vtn.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: peBR6qfZUUif3cJzH5vcCA
+! Checksum: f3+s7ht5j1bPin2lsP2AyQ
 ! Fanboy's Vietnamese-addon Adblock list 
-! Updated: 2 Oct 2011
+! Updated: 5 Oct 2011
 ! This list expires after 5 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: fanboyadblock@googlegroups.com - Project homepage: http://fanboy.co.nz/
@ -213,7 +213,7 @@ _quangcao.
 !     
 !---------- Popups (Adblock Plus Pop-up Addon required) ----------
 !   
-||xemphimvn.org^$other
+||xemphimvn.org^$other,popup,image,~image
 !
 !---------- Vietnamese Trackers ------------
 !