DataObjects/Core_watch.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 67e8f1f..2ec116d 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -3,6 +3,13 @@
 /**
  *
  *  code that used to be in Pman (sendTemplate / emailTemplate)
+ * 
+ *  template is in template directory subfolder 'mail'
+ *   
+ *  eg. use 'welcome' as template -> this will use templates/mail/welcome.txt
+ *  if you also have templates/mail/welcome.body.html - then that will be used as 
+ *     the html body
+ * 
  *
  *  usage:
  *
@@ -13,9 +20,18 @@
        page => 
        contents
        template
-       replaceImages => true|false
+       replaceImages => true|false,
+       rcpts => array()   // override recipients..
     ]
  *
+ *  recipents is gathered from the resulting template
+ *   -- eg.
+ *    To: <a>,<b>,<c>
+ * 
+ * 
+ *  if the file     '
+ * 
+ * 
  *  $x->asData(); // returns data needed for notify?? - notify should really
  *                  // just use this to pass around later..
  *
@@ -29,7 +45,8 @@ class Pman_Core_Mailer {
     var $contents       = false; /* object or array */
     var $template       = false; /* string */
     var $replaceImages  = false; /* boolean */
-    
+    var $rcpts   = false;
+    var $templateDir = false;
     
     var $images         = array(); // generated list of cid images for sending
     
@@ -51,7 +68,7 @@ class Pman_Core_Mailer {
         $templateFile = $this->template;
         $args = $this->contents;
         
-        $content  = clone($page);
+        $content  = clone($this->page);
         
         foreach((array)$args as $k=>$v) {
             $content->$k = $v;
@@ -74,8 +91,14 @@ class Pman_Core_Mailer {
         
         require_once 'HTML/Template/Flexy.php';
         
+        $tmp_opts = array();
+        if (!empty($this->templateDir)) {
+            $tmp_opts['templateDir'] = $this->templateDir;
+        }
+        
+        
         $htmlbody = false;
-        $htmltemplate = new HTML_Template_Flexy(  );
+        $htmltemplate = new HTML_Template_Flexy( $tmp_opts );
 
         if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) {
             // then we have a multi-part email...
@@ -86,16 +109,14 @@ class Pman_Core_Mailer {
             
             // for the html body, we may want to convert the attachments to images.
             
-            $this->htmlbodytoCID($htmlbody);
+            $htmlbody = $this->htmlbodytoCID($htmlbody);
             
-             
+              
         }
         
+        $tmp_opts['nonHTML'] = true;
         
-        
-        $template = new HTML_Template_Flexy( array(
-                'nonHTML' => true,
-        ));
+        $template = new HTML_Template_Flexy(  $tmp_opts );
         
         $template->compile('mail/'. $templateFile.'.txt');
         
@@ -146,10 +167,9 @@ class Pman_Core_Mailer {
                 $mime->addHTMLImage(
                     $cdata['file'],
                      $cdata['mimetype'],
-                    $cdata['mimetype'],
-                    $cid.'.'.$cdata['ext'],
+                     $cid.'.'.$cdata['ext'],
                     true,
-                    $cid
+                    $cdata['contentid']
                 );
             }
             $parts[2] = $mime->get();
@@ -176,12 +196,18 @@ class Pman_Core_Mailer {
         ///$recipents = array($this->email);
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         $mail = Mail::factory("SMTP",$mailOptions);
-        $headers['Date'] = date('r');
+        $headers['Date'] = date('r'); 
         if (PEAR::isError($mail)) {
             return $mail;
         } 
+        $rcpts = $this->rcpts == false ? $email['recipents'] : $this->rcpts;
+        
+        if (!empty($this->contents['bcc']) && is_array($this->contents['bcc'])) {
+            $rcpts =array_merge(is_array($rcpts) ? $rcpts : array($rcpts), $this->contents['bcc']);
+        }
+        
         $oe = error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
-        $ret = $mail->send($email['recipents'],$email['headers'],$email['body']);
+        $ret = $mail->send($rcpts,$email['headers'],$email['body']);
         error_reporting($oe);
        
         return $ret;
@@ -194,11 +220,11 @@ class Pman_Core_Mailer {
         $imgs= $dom->getElementsByTagName('img');
         
         foreach ($imgs as $i=>$img) {
-            $url  = $dom->getAttribute('src');
+            $url  = $img->getAttribute('src');
             $conv = $this->fetchImage($url);
             $this->images[$conv['contentid']] = $conv;
             
-            $url->setAttribute('src', 'cid:' . $conv['contentid']);
+            $img->setAttribute('src', 'cid:' . $conv['contentid']);
             
             
         }
@@ -209,7 +235,27 @@ class Pman_Core_Mailer {
     }
     function fetchImage($url)
     {
-        print_R($url);
+        
+        if ($url[0] == '/') {
+            $file = $this->page->rootDir . $url;
+            require_once 'File/MimeType.php';
+            $m  = new File_MimeType();
+            $mt = $m->fromFilename($file);
+            $ext = $m->toExt($mt); 
+            
+            return array(
+                    'mimetype' => $mt,
+                   'ext' => $ext,
+                   'contentid' => md5($file),
+                   'file' => $file
+            );
+            
+            
+            
+        }
+        
+        //print_R($url); exit;
+        
         
         if (preg_match('#^file:///#', $url)) {
             $file = preg_replace('#^file://#', '', $url);
@@ -239,8 +285,8 @@ class Pman_Core_Mailer {
             mkdir(dirname($cache),0666, true);
         }
         
-        
-        $a = &new HTTP_Request($url);
+        require_once 'HTTP/Request.php';
+        $a = new HTTP_Request($url);
         $a->sendRequest();
         file_put_contents($cache .'.data', $a->getResponseBody());