X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Femail.php-class;h=c7e1ee4f657e3d95fef5d852bde131b84267f09f;hp=76bdfaf8706e6168135f9fbf5f2cc6fa5d7e33a6;hb=ba79b48c782b861d2086d19ac496a9fecb09e403;hpb=4edf094ee1ca4623252ba93d29121a0f1e553a20

diff --git a/include/classes/email.php-class b/include/classes/email.php-class
index 76bdfaf..c7e1ee4 100755
--- a/include/classes/email.php-class
+++ b/include/classes/email.php-class
@@ -93,6 +93,9 @@ class email {
   // public function addHeader($hname, [$hcontent])
   //   add a header to the mail
   //
+  // public function addHeaderAddress($hname, $email, [$name])
+  //   add an address header to the mail, possibly with both name and mail parts
+  //
   // public function addMailText($textpart)
   //   add some text to the mail
   //
@@ -149,6 +152,12 @@ class email {
     $this->headers[] = array('name' => $hname, 'content' => $hcontent);
   }
 
+  public function addHeaderAddress($hname, $email, $name = '') {
+    if (strlen($name)) { $hcontent = $this->mimeencode($name, true).' <'.$email.'>'; }
+    else { $hcontent = $email; }
+    $this->headers[] = array('name' => $hname, 'content' => $hcontent);
+  }
+
   public function addMailText($textpart) { $this->mailtext .= $textpart; }
 
   public function addAttachment($aname, $acontent, $atype = 'application/octet-stream') {
@@ -173,11 +182,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) {
@@ -238,12 +252,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)) {