Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-26 03:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #872 from pi-hole/release/v4.1

Browse Source 
Update development with final v4.1 changes
This commit is contained in:
Mark Drobnak
2018-12-09 22:14:30 -05:00
committed by GitHub
parent c4b9018a40 185a5c7cbf
commit 9fa4cc62cb
6 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/pi-hole/php/savesettings.php
View File

@@ -476,13 +476,13 @@ function readAdlists()
{
$adminemail = 'noadminemail';
}
elseif(!filter_var($adminemail, FILTER_VALIDATE_EMAIL))
elseif(!filter_var($adminemail, FILTER_VALIDATE_EMAIL) || strpos($adminemail, "'") !== false)
{
$error .= "Administrator email address (".htmlspecialchars($adminemail).") is invalid!<br>";
}
else
{
exec('sudo pihole -a -e '.$adminemail);
exec('sudo pihole -a -e \''.$adminemail.'\'');
}
if(isset($_POST["boxedlayout"]))
{
@@ -696,8 +696,29 @@ function readAdlists()
$level = intval($_POST["privacylevel"]);
if($level >= 0 && $level <= 4)
{
// Check if privacylevel is already set
if (isset($piholeFTLConf["PRIVACYLEVEL"])) {
$privacylevel = intval($piholeFTLConf["PRIVACYLEVEL"]);
} else {
$privacylevel = 0;
}
// Store privacy level
exec("sudo pihole -a privacylevel ".$level);
$success .= "The privacy level has been updated";
if($privacylevel > $level)
{
exec("sudo pihole -a restartdns");
$success .= "The privacy level has been decreased and the DNS resolver has been restarted";
}
elseif($privacylevel < $level)
{
$success .= "The privacy level has been increased";
}
else
{
$success .= "The privacy level has been not been changed";
}
}
else
{