From 46213b90b076bba00aa9179e1670083298c9a360 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Mar 2020 14:32:27 +0000
Subject: [PATCH] Added contant adblock_listpath

---
 config/config.php     |  2 ++
 includes/adblock.php  | 12 ++++++++----
 includes/defaults.php |  2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/config.php b/config/config.php
index 479419d1..df525a7c 100755
--- a/config/config.php
+++ b/config/config.php
@@ -11,6 +11,8 @@ define('RASPI_CACHE_PATH', sys_get_temp_dir() . '/raspap');
 // These are typical for default RPi installs. Modify if needed.
 define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.conf');
 define('RASPI_DNSMASQ_LEASES', '/var/lib/misc/dnsmasq.leases');
+define('RASPI_ADBLOCK_LISTPATH', '/etc/raspap/adblock/');
+define('RASPI_ADBLOCK_CONFIG', '/etc/dnsmasq.d/090_adblock.conf');
 define('RASPI_HOSTAPD_CONFIG', '/etc/hostapd/hostapd.conf');
 define('RASPI_DHCPCD_CONFIG', '/etc/dhcpcd.conf');
 define('RASPI_WPA_SUPPLICANT_CONFIG', '/etc/wpa_supplicant/wpa_supplicant.conf');
diff --git a/includes/adblock.php b/includes/adblock.php
index a2af5789..d6b67ba4 100644
--- a/includes/adblock.php
+++ b/includes/adblock.php
@@ -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"
         )
     );
diff --git a/includes/defaults.php b/includes/defaults.php
index 36147b91..9f5a98d2 100755
--- a/includes/defaults.php
+++ b/includes/defaults.php
@@ -15,6 +15,8 @@ $defaults = [
   // These are typical for default RPi installs. Modify if needed.
   'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.conf',
   'RASPI_DNSMASQ_LEASES' => '/var/lib/misc/dnsmasq.leases',
+  'RASPI_ADBLOCK_LISTPATH' => '/etc/raspap/adblock/',
+  'RASPI_ADBLOCK_CONFIG' => '/etc/dnsmasq.d/090_adblock.conf',
   'RASPI_HOSTAPD_CONFIG' => '/etc/hostapd/hostapd.conf',
   'RASPI_DHCPCD_CONFIG' => '/etc/dhcpcd.conf',
   'RASPI_WPA_SUPPLICANT_CONFIG' => '/etc/wpa_supplicant/wpa_supplicant.conf',