DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index 3ab74eb..ec47f6d 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -41,6 +41,16 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     ###END_AUTOCODE
     /**
      *
+     * Build an email to sent do user
+     *
+     * key 'args'
+     *
+     * no_auth => disable authentication check on
+     * templateDir => alternative template directory.
+     * HTTP_HOST
+     *
+     * expects mail/TMPLATE.txt (if .html exists, it will be the html body version)
+     * 
      * @param {String} $templateFile  (mail/XXXXXXX.txt) exclude the mail and .txt bit.
      * @param {Array|Object} $args   data to send out..
      * @return {Array|PEAR_Error} array of $recipents, $header, $body 
@@ -96,16 +106,28 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $tops['templateDir'] = $args['templateDir'];
         }
         
-        require_once 'HTML/Template/Flexy.php';
-        $template = new HTML_Template_Flexy( $tops );
         
-     
-         
         
+        require_once 'HTML/Template/Flexy.php';
+        $template = new HTML_Template_Flexy( $tops );
         $template->compile("mail/$templateFile.txt");
         
         /* use variables from this object to ouput data. */
         $mailtext = $template->bufferedOutputObject($content);
+        
+        $htmlbody = false;
+        // if a html file with the same name exists, use that as the body
+        // I've no idea where this code went, it was here before..
+        if (false !== $template->resolvePath ( "mail/$templateFile.html" )) {
+            $tops['nonHTML'] = false;
+            $template = new HTML_Template_Flexy( $tops );
+            $template->compile("mail/$templateFile.html");
+            $htmlbody = $template->bufferedOutputObject($content);
+            
+        }
+        
+        
+        
         //echo "<PRE>";print_R($mailtext);
         //print_R($mailtext);exit;
         /* With the output try and send an email, using a few tricks in Mail_MimeDecode. */
@@ -114,6 +136,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         
         $decoder = new Mail_mimeDecode($mailtext);
         $parts = $decoder->getSendArray();
+        
         if (PEAR::isError($parts)) {
             return $parts;
             //echo "PROBLEM: {$parts->message}";
@@ -126,6 +149,20 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         }
         $headers['Date'] = date('r');
         
+        if ($htmlbody !== false) {
+            require_once 'Mail/mime.php';
+            $mime = new Mail_mime(array('eol' => "\n"));
+            $mime->setTXTBody($body);
+            $mime->setHTMLBody($htmlbody);
+            // I think there might be code in mediaoutreach toEmail somewhere
+            // h embeds images here..
+            $body = $mime->get();
+            $headers = $mime->headers($headers);
+            
+        }
+        
+         
+        
         return array(
             'recipients' => $recipents,
             'headers'    => $headers,