Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 18:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2301 from pi-hole/email

Browse Source 
Remove email functionality
This commit is contained in:
yubiuser
2022-08-21 10:11:43 +02:00
committed by GitHub
parent 844e24bc76 42a24cfcea
commit c6b64ae570
3 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/pi-hole/php/func.php
View File

@@ -86,16 +86,6 @@ function validMAC($mac_addr)
return !filter_var($mac_addr, FILTER_VALIDATE_MAC) === false;
}
function validEmail($email)
{
return filter_var($email, FILTER_VALIDATE_EMAIL)
// Make sure that the email does not contain special characters which
// may be used to execute shell commands, even though they may be valid
// in an email address. If the escaped email does not equal the original
// email, it is not safe to store in setupVars.
&& escapeshellcmd($email) === $email;
}
function get_ip_type($ip)
{
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? 4 :

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

@@ -416,15 +416,6 @@ if (isset($_POST['field'])) {
break;
case 'webUI':
$adminemail = trim($_POST['adminemail']);
if (strlen($adminemail) == 0 || !isset($adminemail)) {
$adminemail = '';
}
if (strlen($adminemail) > 0 && !validEmail($adminemail)) {
$error .= 'Administrator email address ('.htmlspecialchars($adminemail).') is invalid!<br>';
} else {
pihole_execute('-a -e \''.$adminemail.'\'');
}
if (isset($_POST['boxedlayout'])) {
pihole_execute('-a layout boxed');
} else {