DataObjects/core.sql

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 2a46d47..8fc6021 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -172,6 +172,8 @@ class Pman_Core_Mailer {
             //exit;
         } 
         
+        $isMine = false;
+        
         require_once 'Mail/mime.php';
         $mime = new Mail_mime(array(
             'eol' => "\n",
@@ -206,71 +208,40 @@ class Pman_Core_Mailer {
                     $cdata['contentid']
                 );
             }
-            $parts[2] = $mime->get();
-            $parts[1] = $mime->headers($parts[1]);
-        
+            $isMine = true;
         }
-//        echo '<PRE>';
-//        print_r('parts');
-//        print_r($parts);exit;
+        
         if($this->attachments){
             //if got a attachments
-            $contentType = 'Content-Type: text/plain; charset=utf-8';
-            if (isset($parts[1]['Content-Type'])) {
-                $contentType = $parts[1]['Content-Type'];
-                unset($parts[1]['Content-Type']);
+            
+            $header = $mime->headers($parts[1]);
+            
+            if(preg_match('/text\/html/', $header['Content-Type'])){
+                $mime->setHTMLBody($parts[2]);
+            }else{
+                $mime->setTXTBody($parts[2]);
             }
-            $random_hash = md5(date('r', time()));
-            $parts[1]['Content-Type'] = "multipart/mixed; boundary=mixed-$random_hash";
             
-$str = "
---mixed-$random_hash
-Content-Type: multipart/alternative; boundary=alt-$random_hash
-
---alt-$random_hash
-Content-Type: $contentType
-
-{$parts[2]}
-
---alt-$random_hash--
-
-";
-
-foreach($this->attachments as $attch){
-$str .= "
---mixed-$random_hash
-Content-Type: {$attch['mimetype']}; ".
-((empty($attch['name'])) ? '' : "name=\"{$attch['name']}\"") .
-"Content-Transfer-Encoding: base64 
-Content-Disposition: attachment
-
-{$attch['file']}
-";
-}
-            $str .= "--mixed-$random_hash--";
-
-            $parts[2] = $str;
-//            --mixed-{t.random_hash}
-//Content-Type: multipart/alternative; boundary=alt-{t.random_hash}
-//
-//--alt-{t.random_hash}
-//Content-Type: text/plain; charset=utf-8
-//Content-Transfer-Encoding: 7bit
-//
-//{t.msg}
-//
-//--alt-{t.random_hash}--
-//
-//--mixed-{t.random_hash}
-//Content-Type: application/pdf; name="doc.pdf"
-//Content-Transfer-Encoding: base64 
-//Content-Disposition: attachment
-//
-//{t.attach}
-//--mixed-{t.random_hash}--
+            foreach($this->attachments as $attch){
+                $mime->addAttachment(
+                        $attch['file'],
+                        $attch['mimetype'],
+                        $attch['name'],
+                        false
+                );
+            }
+            
+            $isMine = true;
         }
         
-        
+        if($isMine){
+            $parts[2] = $mime->get();
+            $parts[1] = $mime->headers($parts[1]);
+        }
+//        echo '<PRE>';
+//        print_r('parts');
+//        print_r($parts[2]);
+//        exit;
        // list($recipents,$headers,$body) = $parts;
         return array(
             'recipents' => $parts[0],