Merge pull request #2301 from pi-hole/email

Remove email functionality
pi-hole · Aug 21, 2022 · c6b64ae · c6b64ae
2 parents 844e24b + 42a24cf
commit c6b64ae
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
@@ -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 :

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
@@ -416,15 +416,6 @@ function addStaticDHCPLease($mac, $ip, $hostname)
             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 {

diff --git a/settings.php b/settings.php
@@ -1027,14 +1027,6 @@
                     </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 @@
                                                 </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>