Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-15 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove email functionality

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2022-08-17 23:18:07 +02:00
parent c34c7d4d0e
commit e32bc2d07a
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 {

16
settings.php
View File

@@ -1027,14 +1027,6 @@ if (isset($piholeFTLConf['RATE_LIMIT'])) {
</form>
</div>
<!-- ######################################################### API and Web ######################################################### -->
<?php
// Administrator email address
if (isset($setupVars['ADMIN_EMAIL'])) {
$adminemail = $setupVars['ADMIN_EMAIL'];
} else {
$adminemail = '';
}
?>
<div id="api" class="tab-pane fade<?php if ($tab === 'api') { ?> in active<?php } ?>">
<div class="row">
<div class="col-md-6">
@@ -1138,14 +1130,6 @@ if (isset($setupVars['ADMIN_EMAIL'])) {
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h4>Administrator Email Address</h4>
<input type="email" class="form-control" name="adminemail" value="<?php echo htmlspecialchars($adminemail); ?>">
<input type="hidden" name="field" value="webUI">
<input type="hidden" name="token" value="<?php echo $token; ?>">
</div>
</div>
</div>
<div class="box-footer clearfix">
<button type="submit" class="btn btn-primary pull-right">Save</button>