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 bf7273c..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 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
   //
@@ -164,6 +170,45 @@ class email {
     $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 = '';
@@ -182,11 +227,16 @@ class email {
     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);
     }
+    if (!strlen($recpt)) {
+      return null;
+    }
     if (count($this->cc)) {
       $adrs = '';
       foreach ($this->cc as $address) {
@@ -247,12 +297,20 @@ class email {
       foreach ($this->attachments as $attach) {
         $mtxt .= "\n".'--'.$boundary."\n";
         $mtxt .= 'Content-Type: '.$attach['type'].'; name="'.$attach['name'].'";'."\n";
-        $mtxt .= 'Content-Transfer-Encoding: base64'."\n";
-        $mtxt .= 'Content-Disposition: attachment'."\n\n";
-        $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ;
-        $mtxt .= "\n";
+        if (preg_match('/^(text|message)\//', $attach['type'])) {
+          $mtxt .= 'Content-Transfer-Encoding: 8bit'."\n";
+          $mtxt .= 'Content-Disposition: attachment'."\n\n";
+          $mtxt .= $attach['content'];
+          $mtxt .= "\n";
+        }
+        else {
+          $mtxt .= 'Content-Transfer-Encoding: base64'."\n";
+          $mtxt .= 'Content-Disposition: attachment'."\n\n";
+          $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ;
+          $mtxt .= "\n";
+        }
       }
-      $mtext .= '--'.$boundary.'--'."\n";
+      $mtxt .= '--'.$boundary.'--'."\n";
     }
 
     if (strlen($this->debug_toSingleAddress)) {
@@ -280,7 +338,5 @@ class email {
     }
   return $mText;
   }
-
-
 }
 ?>