DataObjects/Core_person_signup.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 78f7246..bd8164e 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -179,7 +179,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     function processRelacements($replace_links = true)
     {   
         $cfg = isset(HTML_FlexyFramework::get()->Pman_Crm) ? HTML_FlexyFramework::get()->Pman_Crm : false;
-        print_r($cfg);exit;
+        
         libxml_use_internal_errors (true);
         $doc = new DOMDocument('1.0', 'UTF-8');
         $doc->loadHTML('<?xml encoding="UTF-8">'.$this->bodytext);
@@ -242,7 +242,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $element->setAttribute('height', '1');
 
             $html = $doc->getElementsByTagName('html');
-            $html->item(0)->appendChild($element);
+            if ($html->length) {
+                $html->item(0)->appendChild($element);
+            }
             
             $this->plaintext = str_replace("{unsubscribe_link}", $unsubscribe, $this->plaintext);
         }
@@ -257,24 +259,46 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
          
         return;
     }
-    
+    /**
+     *
+     * Usage:
+     * $this->rcpts = array('sales@roojs.com');
+     * // or 
+     * $this->rcpts = "Tester <sales@roojs.com>";
+     *
+     * 
+     * // then send it..
+     * $x = DB_DataObject::factory('core_enum');
+     * $x->get('name', 'NAME OF TEMPLATE');
+     * $x->send(array(
+     *      'rcpts' => "Tester <sales@roojs.com>",
+     *      'page' => $this
+     *       'link' => 'http://......'
+       );
+     * // on the template use {link:h} to render the link
+     *
+     *
+     */
     function send($obj, $force = true, $send = true)
     {   
-        $this->processRelacements(true);
-        exit;
         $contents = (array)$obj;
-        
+
         if(empty($this->id)){
             $this->get('name', $contents['template']);
         }
         
         if(empty($this->id)){
-            return PEAR::raiseError("template [{$contents['template']}]has not been set");
+            $p = new PEAR();
+            return $p->raiseError("template [{$contents['template']}] has not been set");
         }
         if(empty($contents['subject'])){
            $contents['subject'] = $this->subject; 
         }
         
+        if(!empty($contents['rcpts']) && is_array($contents['rcpts'])){
+            $contents['rcpts'] = implode(',', $contents['rcpts']);
+        }
+        
         $ui = posix_getpwuid(posix_geteuid());
         
         $cachePath = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '.txt';
@@ -286,13 +310,18 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         require_once 'Pman/Core/Mailer.php';
         
         $templateDir = session_save_path() . '/email-cache-' . $ui['name'] ;
-        
-        $r = new Pman_Core_Mailer(array(
+        //print_r($this);
+        $cfg = array(
             'template'=> $this->tableName() . '-' . $this->id,
             'templateDir' => $templateDir,
             'page' => $this,
             'contents' => $contents
-        ));
+        );
+        if (isset($contents['rcpts'])) {
+            $cfg['rcpts'] = $contents['rcpts'];
+        }
+        
+        $r = new Pman_Core_Mailer($cfg);
         
         $imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
         
@@ -307,18 +336,17 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             return $ret;
         }
         
-        return $r->send($ret);
+        return $r->send();
     }
     
     function cachedMailWithOutImages($force = false, $replace_links = true)
     {  
         
-        
         $ui = posix_getpwuid(posix_geteuid());
         
         $cachePath = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '.txt';
           
-        if ($this->isGenerated($cachePath)) {
+        if (!$force && $this->isGenerated($cachePath)) {
             return;
         }
         
@@ -334,10 +362,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
 
         fwrite($fh, implode("\n", array(
             "From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
-            "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{foreach:rcpts,v}{v:h},{end:}{end:}",
-            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}",
+            "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{rcpts:h}{end:}",
             "Subject: {t.subject} ",
-            "X-Message-ID: {t.id} "
+            "X-Message-ID: {t.id} ",
+            "{if:t.replyTo}Reply-To: {t.replyTo:h}{end:}"
         ))."\n");
         
         
@@ -433,7 +461,10 @@ Content-Transfer-Encoding: 7bit
     
     function messageFrom()
     {
-        return '"' . addslashes($this->from_name) . '" <' . $this->from_email. '>'  ;
+        if (empty($this->from_name)) {
+            return trim($this->from_email);
+        }
+        return trim('"' . addslashes($this->from_name) . '" <' . $this->from_email. '>')  ;
     }
     
     function formatDate($dt, $format = 'd/M/Y')