Migrate notify_admin_by_mail function

ltb-project · Jul 12, 2024 · 4a13a43 · 4a13a43
1 parent a25da54
commit 4a13a43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/htdocs/resetpassword.php b/htdocs/resetpassword.php
@@ -130,7 +130,8 @@
 
             # Notify administrator if needed
             $data = array( "dn" => $dn );
-            notify_admin_by_mail($mail_from, $mail_from_name, $messages["changesubjectforadmin"], $messages["changemessageforadmin"], $mail_signature, $data);
+            $admin_mail_list = get_admin_mail_list($notify_admin_by_mail, $notify_admin_by_mail_list);
+            $mailer->send_mail($admin_mail_list, $mail_from, $mail_from_name, $messages["changesubjectforadmin"], $messages["changemessageforadmin"], $mail_signature, $data);
         }
 
     }

diff --git a/lib/mail.inc.php b/lib/mail.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-# Notify administrators
-function notify_admin_by_mail($mail_from, $mail_from_name, $changesubject, $changemessage, $mail_signature, $data)
+# Get administrators mail list but remove duplicates
+function get_admin_mail_list($notify_admin_by_mail, $notify_admin_by_mail_list)
 {
-    global $notify_admin_by_mail;
-    global $notify_admin_by_mail_list;
 
     $admin_mail_list=array();
 
@@ -22,13 +20,7 @@ function notify_admin_by_mail($mail_from, $mail_from_name, $changesubject, $chan
         }
     }
 
-    if (! empty($admin_mail_list))
-    {
-        if ( !$mailer->send_mail($admin_mail_list, $mail_from, $mail_from_name, $changesubject, $changemessage.$mail_signature, $data) ) {
-            error_log("Error while sending email to administrators $admin_mail_list");
-        }
-    }
-
+    return $admin_mail_list;
 }
 
 ?>