Added contant adblock_listpath

This commit is contained in:
billz
2020-03-27 14:32:27 +00:00
parent ab68168951
commit 46213b90b0
3 changed files with 12 additions and 4 deletions

View File

@@ -16,18 +16,21 @@ function DisplayAdBlockConfig()
if (!RASPI_MONITOR_ENABLED) {
if (isset($_POST['saveadblocksettings'])) {
if ($_POST['adblock-enable'] == "1") {
$arrConf['conf-file'] = '/etc/dnsmasq.d/domains.txt';
$arrConf['addn-hosts'] = '/etc/dnsmasq.d/hostnames.txt';
$arrConf['conf-file'] = RASPI_ADBLOCK_LISTPATH .'domains.txt';
$arrConf['addn-hosts'] = RASPI_ADBLOCK_LISTPATH .'hostnames.txt';
} else {
unset($arrConf['conf-file']);
unset($arrConf['addn-hosts']);
}
$config = array_map(function($value, $key) {
return $key.'='.$value;
if (is_bool($value)) {
return $key;
} else {
return $key.'='.$value;
}
}, array_values($arrConf), array_keys($arrConf));
$config = implode(PHP_EOL, $config);
$config = $config . PHP_EOL;
file_put_contents("/tmp/dnsmasqdata", $config);
system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_CONFIG, $return);
@@ -47,6 +50,7 @@ function DisplayAdBlockConfig()
"adblock", compact(
"status",
"serviceStatus",
"dnsmasq_state",
"arrConf"
)
);