fix saving of time_sent_latest for bounce messages

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

diff --git a/include/classes/email.php-class b/include/classes/email.php-class
old mode 100755 (executable)
new mode 100644 (file)
index c7e1ee4..2de9ca4
--- 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,45 @@ 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
+    if (!is_array($addrtype)) {
+      if (strlen($addrtype)) { $addrtype = explode(',', strtolower($addrtype)); }
+      else { $addrtype = array('to','cc','bcc'); }
+    }
+    $mailaddresses = array();
+
+    if (in_array('to', $addrtype)) {
+      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('cc', $addrtype)) {
+      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('bcc', $addrtype)) {
+      foreach ($this->bcc as $address) {
+        if (strlen(@$address['mail'])) {
+          $mailaddresses[] = array('mail'=>$address['mail'],
+                                   'name'=>strlen($address['name'])?$address['name']:'',
+                                   'addrtype'=>'bcc');
+        }
+      }
+    }
+
+    return $mailaddresses;
+  }
+

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


@@ -293,7 +338,5 @@ class email {
     }
   return $mText;
   }
     }
   return $mText;
   }

-
-

 }
 ?>
 }
 ?>