fixed bug, about maker for wide rules

anti-ad-easylist.txt

@@ -1,7 +1,7 @@
 !TITLE=anti-AD
-!VER=20200726170955
+!VER=20200726225412
 !URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=34937
+!TOTAL_LINES=34897
 ||*.wap.xsbiquge.com^
 ||*serror*.wo.com.cn^
 ||201*.myhard.com^
@@ -88,7 +88,7 @@
 ||dsp*.youdao.com^
 ||pussl*.com^
 ||putrr*.com^
-||ad.*.360.cn^
+||ad*.360.cn^
 ||t*.a.market.xiaomi.com^
 ||ad*.bigmir.net^
 ||log*.molitv.cn^
@@ -96,7 +96,6 @@
 ||cloudservice*.kingsoft-office-service.com^
 ||gg*.51cto.com^
 ||log.*.hunantv.com^
-||*.log.hunantv.com^
 ||iflyad.*.openstorage.cn^
 ||*customstat*.51togic.com^
 ||appcloud*.zhihu.com^
@@ -120,11 +119,12 @@
 ||24log.*^
 ||24smi.*^
 ||ad-*.wikawika.xyz^
-||*.ablen*.tk^
+||ablen*.tk^
-||*.darking*.tk^
+||darking*.tk^
-||*.doubleclick*.xyz^
+||doubleclick*.xyz^
-||*.thepiratebay.*^
+||thepiratebay.*^
-||*.freecontent.*^
+||adserver.*^
+||advert*.*^
 ||00-gov.cn^
 ||kwcdn.000dn.com^
 ||kwcscdn.000dn.com^
@@ -741,6 +741,7 @@
 /^(\S+\.)?track(ing)?\./
 ||24kad.com^
 ||api.24kidea.com^
+||24smile.org^
 ||24vunvrv.com^
 ||24x7adservice.com^
 ||2526game.com^
@@ -3245,37 +3246,6 @@
 ||adversalservers.com^
 ||adverserve.net^
 ||adversolutions.com^
-||advertarium.com.ua^
-||advertbox.us^
-||adverti.io^
-||advertica-cdn.com^
-||advertica.ae^
-||adverticum.net^
-||advertise.com^
-||advertisegame.com^
-||advertiserurl.com^
-||advertisespace.com^
-||advertiseworld.com^
-||advertiseyourgame.com^
-||advertising.com^
-||advertising365.com^
-||advertisingiq.com^
-||advertisingsex.com^
-||advertisingvalue.info^
-||advertjunction.com^
-||advertlane.com^
-||advertlets.com^
-||advertmarketing.com^
-||advertmedias.com^
-||advertnative.com^
-||advertnetworks.com^
-||advertom.com^
-||advertone.ru^
-||advertpay.net^
-||advertrtb.com^
-||advertserve.com^
-||advertstream.com^
-||advertur.ru^
 ||advfeeds.com^
 ||advg.jp^
 ||advgoogle.com^
@@ -4259,11 +4229,9 @@
 ||aodsywsxzquemt.com^
 ||b-aws.aol.com^
 ||adinfo.aol.com^
-||advertising.aol.com^
 ||dynamic.aol.com^
 ||free.aol.com^
 ||im.aol.de^
-||adserver.aol.fr^
 ||aombjl099.com^
 ||aomde.com^
 ||aomeishang.com^
@@ -4999,8 +4967,6 @@
 ||baiapk.com^
 ||baichuanbi.wang^
 ||game.baichuanhd.cn^
-||advertise.baicizhan.com^
-||advertise.baicizhan.org^
 ||baicoath.net^
 ||baidu-taobao-av.com^
 ||a.baidu.cn^
@@ -10207,7 +10173,6 @@
 ||duroternout.info^
 ||dushimj.com^
 ||wew.dushiwenxue.net^
-||advertising.dushu.io^
 ||dustumbs.pro^
 ||dutinf.com^
 ||dutuu.net^
@@ -14687,6 +14652,7 @@
 ||da.hunantv.com^
 ||res.hunantv.com^
 ||click.hunantv.com^
+||log.hunantv.com^
 ||p2.hunantv.com^
 ||hundun.mobi^
 ||hung.ch^
@@ -18630,7 +18596,6 @@
 ||hit.webcentre.lycos.co.uk^
 ||beacon.lycos.com^
 ||adbuyer3.lycos.com^
-||advertising.lycos.com^
 ||client.sidesearch.lycos.com^
 ||cm8.lycos.com^
 ||guestworld.tripod.lycos.com^
@@ -20118,7 +20083,6 @@
 ||log2.mtime.cn^
 ||logx.mtime.cn^
 ||logx.mtime.com^
-||advert.mting.info^
 ||mtldesigns.ca^
 ||mtmob.com^
 ||mtmuhcmpz.com^
@@ -22350,7 +22314,6 @@
 ||panachetech.com^
 ||panazan.ro^
 ||panda.network^
-||adserver.pandora.com^
 ||tracker.pandora.com^
 ||lg.tr.pandora.tv^
 ||log.sv.pandora.tv^
@@ -24168,7 +24131,6 @@
 ||qneowzuyfzyfs.com^
 ||qnkiueuflzdold.com^
 ||qnnawbvdyuql.com^
-||advertisement.glb.qnniu.com^
 ||qnprzxurkv.com^
 ||qnsr.com^
 ||qnvih8.cn^
@@ -27858,6 +27820,7 @@
 ||superwebs.pro^
 ||supfast.net^
 ||supletcedintand.pro^
+||te.supportfreecontent.com^
 ||supportxmr.com^
 ||supuv2.com^
 ||supuv3.com^
@@ -28647,7 +28610,6 @@
 ||theih1w.top^
 ||theirsvendor.com^
 ||jobs.thejobnetwork.com^
-||advert.api.thejoyrun.com^
 ||thekat.nl^
 ||sp.theleafchronicle.com^
 ||theloungenet.com^
@@ -28674,6 +28636,7 @@
 ||imgad.thepaper.cn^
 ||imgadpai.thepaper.cn^
 ||thepayporn.com^
+||thepiratebay-proxylist.se^
 ||theporndude.com^
 ||thepornsurvey.com^
 ||therebelfasters.info^
@@ -29819,7 +29782,6 @@
 ||ubertracking.info^
 ||ubgzicuglk.com^
 ||ubiquitousyard.com^
-||adserver.ubiyoo.com^
 ||ubmoipypwf.com^
 ||ubnwujaioruel.com^
 ||ubontcdrvoce.com^
@@ -32843,7 +32805,6 @@
 ||xp3366.com^
 ||xp666.com^
 ||xpahdmitqadqda.com^
-||adserver.xpanama.net^
 ||xpbjjdrcwuqkks.com^
 ||xpctraffic.com^
 ||xpeeps.com^
@@ -32993,7 +32954,6 @@
 ||xunkhuczqnuf.com^
 ||xunlaile.com^
 ||adsp.xunlei.com^
-||advertpay.vip.xunlei.com^
 ||api-u-ssl.xunlei.com^
 ||kkpgv2.xunlei.com^
 ||live.xunlei.com^
@@ -33181,7 +33141,6 @@
 ||tw.rd.yahoo.com^
 ||visit.webhosting.yahoo.com^
 ||votes.buzz.yahoo.com^
-||adserver.yahoo.com^
 ||comet.yahoo.com^
 ||doubleplay-conf-yql.media.yahoo.com^
 ||fc.yahoo.com^
@@ -34916,6 +34875,7 @@
 @@||ads.pinterest.com^
 @@||ads.tiktok.com^
 @@||ads.ultimatesurrender.com^
+@@||advert.kf5.com^
 @@||api.ads.tvb.com^
 @@||img.ads.tvb.com^
 @@||widget.clipix.com^

scripts/tools/easylist-extend.php

@@ -34,7 +34,7 @@ $ARR_MERGED_WILD_LIST = array(
     'dsp*.youdao.com' => null,
     'pussl*.com' => null,
     'putrr*.com' => null,
-    'ad.*.360.cn' => null,
+    'ad*.360.cn' => null,
     't*.a.market.xiaomi.com' => null,
     'ad*.bigmir.net' => null,
     'log*.molitv.cn' => null,
@@ -42,7 +42,6 @@ $ARR_MERGED_WILD_LIST = array(
     'cloudservice*.kingsoft-office-service.com' => null,
     'gg*.51cto.com' => null,
     'log.*.hunantv.com' => null,
-    '*.log.hunantv.com' => null,
     'iflyad.*.openstorage.cn' => null,
     '*customstat*.51togic.com' => null,
     'appcloud*.zhihu.com' => null,
@@ -66,11 +65,12 @@ $ARR_MERGED_WILD_LIST = array(
     '24log.*' => null,
     '24smi.*' => null,
     'ad-*.wikawika.xyz' => null,
-    '*.ablen*.tk' => null,
+    'ablen*.tk' => null,
-    '*.darking*.tk' => null,
+    'darking*.tk' => null,
-    '*.doubleclick*.xyz' => null,
+    'doubleclick*.xyz' => null,
-    '*.thepiratebay.*' => null,
+    'thepiratebay.*' => null,
-    '*.freecontent.*' => null,
+    'adserver.*' => null,
+    'advert*.*' => null,
 );
 
 $ARR_REGEX_LIST = array(
@@ -234,7 +234,8 @@ while(!feof($src_fp)){
     }
 
     foreach($arr_wild_src as $core_str => $wild_row){
-        $match_rule = str_replace('*', '.*', $core_str);
+//        $match_rule = str_replace('*', '.*', $core_str);
+        $match_rule = str_replace(array('.', '*'), array('\\.', '.*'), $core_str);
         if(!array_key_exists($core_str, $wrote_wild)){
             $written_size += fwrite($new_fp, "||${core_str}^\n");
             $line_count++;
@@ -281,8 +282,8 @@ foreach($ARR_WHITE_RULE_LIST as $row => $v){
         if($core_str{0} === '/'){
             $match_rule = $core_str;
         }else{
-            $match_rule = str_replace('*', '.*', $core_str);
+            $match_rule = str_replace(array('.', '*'), array('\\.', '.*'), $core_str);
-            $match_rule = "/${match_rule}/";
+            $match_rule = "/^${match_rule}/";
         }
         if(preg_match($match_rule, $matches[1])){
             $domain = addressMaker::extract_main_domain($matches[1]);