bug fix

lib/addressMaker.class.php

@@ -74,7 +74,7 @@ class addressMaker {
                 continue;
             }
 
-            if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*(image|third-party|script|subdocument|popup)?(,.+)?$/', $line, $matches)){
+            if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*(image|third-party|script)?(,.+)?$/', $line, $matches)){
 
                 if(substr($matches[1], 0, 4) == 'www.'){
                     $row = substr($matches[1], 4);

make-addr.php

@@ -32,6 +32,6 @@ $arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($
 $arr_result = array_merge_recursive($arr_result, $arr_blacklist);
 
 echo 'Written file size:';
-echo addressMaker::write_to_conf($arr_result, writerFormat::DNSMASQ);
+echo addressMaker::write_to_conf($arr_result, writerFormat::EASYLIST);