handle problematic ('bad') addresses with a bounce watch table; for this, add a funct...

[php-utility-classes.git] / include / classes / email.php-class

diff --git a/include/classes/email.php-class b/include/classes/email.php-class
index a2defcecfdf0720e51739e4f108ab746fee3841c..0c485fe3dcbf2b9a81fab4fa6ca51bbbee1bf4a7 100755 (executable)
--- a/include/classes/email.php-class
+++ b/include/classes/email.php-class
@@ -102,6 +102,12 @@ class email {
   // public function addAttachment($aname, $acontent, [$atype])
   //   add an attachment to the mail, use given file name, content and MIME type (defaults to application/octet-stream)
   //
   // public function addAttachment($aname, $acontent, [$atype])
   //   add an attachment to the mail, use given file name, content and MIME type (defaults to application/octet-stream)
   //

+  // public function getAddresses([$addrtype])
+  //   returns an array of all addresses this mail gets sent to
+  //     fields: email, name, addrtype
+  //       addrtype is one of to/cc/bcc
+  //       the $addrtype parameter is a comma-separated list of such types, default: all of them
+  //

   // public function send()
   //   really send the mail
   //
   // public function send()
   //   really send the mail
   //


@@ -164,6 +170,41 @@ class email {
     $this->attachments[] = array('name' => $aname, 'content' => $acontent, 'type' => $atype);
   }
 
     $this->attachments[] = array('name' => $aname, 'content' => $acontent, 'type' => $atype);
   }
 

+  public function getAddresses($addrtype = null) {
+    // returns all addresses this mail gets sent to
+    $addrtype = explode(',', strtolower($addrtype));
+    if (!is_array($addrtype)) { $addrtype = array('to','cc','bcc'); }
+    $mailaddresses = array();
+
+    if (in_array($addrtype, 'to')) {
+      foreach ($this->recipients as $address) {
+        if (strlen(@$address['mail'])) {
+          $mailaddresses[] = array('mail'=>$address['mail'],
+                                   'name'=>strlen($address['name'])?$address['name']:'',
+                                   'addrtype'=>'to');
+        }
+      }
+    }
+    if (in_array($addrtype, 'cc')) {
+      foreach ($this->cc as $address) {
+        if (strlen(@$address['mail'])) {
+          $mailaddresses[] = array('mail'=>$address['mail'],
+                                   'name'=>strlen($address['name'])?$address['name']:'',
+                                   'addrtype'=>'cc');
+        }
+      }
+    }
+    if (in_array($addrtype, 'bcc')) {
+      foreach ($this->bcc as $address) {
+        if (strlen(@$address['mail'])) {
+          $mailaddresses[] = array('mail'=>$address['mail'],
+                                   'name'=>strlen($address['name'])?$address['name']:'',
+                                   'addrtype'=>'bcc');
+        }
+      }
+    }
+  }
+

   public function send() {
     global $util;
     $mtxt = '';
   public function send() {
     global $util;
     $mtxt = '';


@@ -182,11 +223,16 @@ class email {
     if (count($this->recipients)) {
       $recpt = '';
       foreach ($this->recipients as $address) {
     if (count($this->recipients)) {
       $recpt = '';
       foreach ($this->recipients as $address) {

-        if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
-        else { $recpt .= $address['mail'].','; }
+        if (strlen(@$address['mail'])) {
+          if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
+          else { $recpt .= $address['mail'].','; }
+        }

       }
       $recpt = preg_replace('/,$/', '', $recpt);
     }
       }
       $recpt = preg_replace('/,$/', '', $recpt);
     }

+    if (!strlen($recpt)) {
+      return null;
+    }

     if (count($this->cc)) {
       $adrs = '';
       foreach ($this->cc as $address) {
     if (count($this->cc)) {
       $adrs = '';
       foreach ($this->cc as $address) {