Autres/RaspAP
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-07-06 21:37:40 +02:00
Code Issues Releases Wiki Activity

Check for presence of custom blocklist in RASPI_ADBLOCK_LISTPATH

Browse Source
This commit is contained in:
billz 2025-04-16 23:33:13 -07:00
parent 125ae7a39a
commit a21b0a8f99
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/adblock.php
View File

@ -40,7 +40,6 @@ function DisplayAdBlockConfig()
file_put_contents("/tmp/dnsmasq_custom", $_POST['adblock-custom-hosts'].PHP_EOL); file_put_contents("/tmp/dnsmasq_custom", $_POST['adblock-custom-hosts'].PHP_EOL);
system("sudo cp /tmp/dnsmasq_custom " .RASPI_ADBLOCK_LISTPATH .'custom.txt', $return); system("sudo cp /tmp/dnsmasq_custom " .RASPI_ADBLOCK_LISTPATH .'custom.txt', $return);
$config.= 'addn-hosts=' .RASPI_ADBLOCK_LISTPATH .'custom.txt'.PHP_EOL; $config.= 'addn-hosts=' .RASPI_ADBLOCK_LISTPATH .'custom.txt'.PHP_EOL;
$custom_enabled = true;
} }
if (empty($errors)) { if (empty($errors)) {
@ -64,6 +63,13 @@ function DisplayAdBlockConfig()
} }
} }
$custom_list = RASPI_ADBLOCK_LISTPATH . 'custom.txt';
$custom_enabled = false;
if (file_exists($custom_list) && filesize($custom_list) > 0) {
$custom_enabled = true;
}
exec('cat '. RASPI_ADBLOCK_CONFIG, $return); exec('cat '. RASPI_ADBLOCK_CONFIG, $return);
$arrConf = ParseConfig($return); $arrConf = ParseConfig($return);
if (sizeof($arrConf) > 0) { if (sizeof($arrConf) > 0) {