From b5d9908bb511aa34ec29777fc21e4b7fe4a1c33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Tue, 26 Oct 2021 19:47:31 +0200 Subject: [PATCH 1/2] Remove traces of leftover API_PRIVACY_MODE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- queries.php | 9 --------- settings.php | 7 ------- 2 files changed, 16 deletions(-) diff --git a/queries.php b/queries.php index 1349d2abe..951e61e70 100644 --- a/queries.php +++ b/queries.php @@ -75,15 +75,6 @@ $showall = true; } -if(isset($setupVars["API_PRIVACY_MODE"])) -{ - if($setupVars["API_PRIVACY_MODE"]) - { - // Overwrite string from above - $showing .= ", privacy mode enabled"; - } -} - if(strlen($showing) > 0) { $showing = "(".$showing.")"; diff --git a/settings.php b/settings.php index 17ce96c3a..d5be58805 100644 --- a/settings.php +++ b/settings.php @@ -185,13 +185,6 @@ $queryLog = "all"; } -// Privacy Mode -if (isset($setupVars["API_PRIVACY_MODE"])) { - $privacyMode = $setupVars["API_PRIVACY_MODE"]; -} else { - $privacyMode = false; -} - ?> Date: Tue, 26 Oct 2021 19:56:19 +0200 Subject: [PATCH 2/2] Remove 'privacyMode' as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- scripts/pi-hole/php/savesettings.php | 29 ++-------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index 0c4d652c0..64afab81f 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -439,26 +439,12 @@ function addStaticDHCPLease($mac, $ip, $hostname) { if(isset($_POST["querylog-permitted"]) && isset($_POST["querylog-blocked"])) { pihole_execute("-a setquerylog all"); - if(!isset($_POST["privacyMode"])) - { - $success .= "All entries will be shown in Query Log"; - } - else - { - $success .= "Only blocked entries will be shown in Query Log"; - } + $success .= "All entries will be shown in Query Log"; } elseif(isset($_POST["querylog-permitted"])) { pihole_execute("-a setquerylog permittedonly"); - if(!isset($_POST["privacyMode"])) - { - $success .= "Only permitted will be shown in Query Log"; - } - else - { - $success .= "No entries will be shown in Query Log"; - } + $success .= "Only permitted will be shown in Query Log"; } elseif(isset($_POST["querylog-blocked"])) { @@ -471,17 +457,6 @@ function addStaticDHCPLease($mac, $ip, $hostname) { $success .= "No entries will be shown in Query Log"; } - - if(isset($_POST["privacyMode"])) - { - pihole_execute("-a privacymode true"); - $success .= " (privacy mode enabled)"; - } - else - { - pihole_execute("-a privacymode false"); - } - break; case "webUI":