Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove traces of leftover API_PRIVACY_MODE #1943

Merged
merged 2 commits into from
Nov 20, 2021
Merged

Remove traces of leftover API_PRIVACY_MODE #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d9908
Remove traces of leftover API_PRIVACY_MODE
yubiuser Oct 26, 2021
9ce065f
Remove 'privacyMode' as well
yubiuser Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions queries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")";
Expand Down
29 changes: 2 additions & 27 deletions scripts/pi-hole/php/savesettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]))
{
Expand All @@ -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":
Expand Down
7 changes: 0 additions & 7 deletions settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,6 @@
$queryLog = "all";
}

// Privacy Mode
if (isset($setupVars["API_PRIVACY_MODE"])) {
$privacyMode = $setupVars["API_PRIVACY_MODE"];
} else {
$privacyMode = false;
}

?>

<?php
Expand Down