This commit is contained in:
gently 2019-12-17 20:19:26 +08:00
parent 99cae56ba8
commit 2ff209b3e1
4 changed files with 536 additions and 1994 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -74,7 +74,7 @@ class addressMaker {
continue; 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.'){ if(substr($matches[1], 0, 4) == 'www.'){
$row = substr($matches[1], 4); $row = substr($matches[1], 4);

View File

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