Ticket #530: jmailer.diff

jMailer.class.php

@@ -86 +86 @@
-    public $Body               = "";
-
-    /**
+     * Use tpl for sets the Body of the message.  This can be either an HTML or text body.
+     * If HTML then run IsHTML(true).
+     * @var string
+     */
+    public $BodyTpl;
+
+    /**
-     * Sets the text-only body of the message.  This automatically sets the
-     * email to multipart/alternative.  This body can be read by mail
-     * clients that do not have HTML email capability such as mutt. Clients
@@ -345 +355 @@
-        $this->ReplyTo[$cur][0] = trim($address);
-        $this->ReplyTo[$cur][1] = $name;
-    }
+    
+    function decAdrs( $adresse, $type = 'addresse' ) {
+        
+        $tab = explode(':', $adresse);
+        if( $type == 'addresse' ) return $tab[0];
+        if( $type == 'name' && isset($tab[1]) ) return $tab[1];
+        
+    }
-
+    /**
+     * Adds a Tpl référence.
+     * @param string $selector
+     * @return void
+     */
+    function Tpl( $selector ) {
+        
+        $this->BodyTpl = $selector;
+        
+    }
-
-    /////////////////////////////////////////////////
-    // MAIL SENDING METHODS
@@ -361 +389 @@
-        $header = "";
-        $body = "";
-        $result = true;
+        
+        if( isset($this->BodyTpl) ) {
+            
+            $mailtpl = new jTpl();
+            $metas = $mailtpl->meta( $this->BodyTpl );
+            
+            if( isset($metas['Subject']) )
+                $this->Subject = $metas['Subject'];
+                
+            if( isset($metas['Priority']) )
+                $this->Priority = $metas['Priority'];
+            $mailtpl->assign('Priority', $this->Priority );
+                
+            if( isset($metas['From']) ) {
+                $this->From = $this->decAdrs( $metas['From'], 'addresse' );
+                $this->FromName = $this->decAdrs( $metas['From'], 'name' );
+            }
+            $mailtpl->assign('From', $this->From );
+            $mailtpl->assign('FromName', $this->FromName );
+            
+            if( isset($metas['Sender']) )
+                $this->Sender = $metas['Sender'];
+            $mailtpl->assign('Sender', $this->Sender );
+            
+            if( isset($metas['to']) )
+                foreach( $metas['to'] as $val ) 
+                    $this->AddAddress($this->decAdrs($val, 'addresse'), $this->decAdrs($val, 'name'));
+            $mailtpl->assign('to', $this->to );
+                    
+            if( isset($metas['cc']) )
+                foreach( $metas['cc'] as $val ) 
+                    $this->AddCC($this->decAdrs($val, 'addresse'), $this->decAdrs($val, 'name'));
+            $mailtpl->assign('cc', $this->cc );
+                    
+            if( isset($metas['bcc']) )
+                foreach( $metas['bcc'] as $val ) 
+                    $this->AddBCC($this->decAdrs($val, 'addresse'), $this->decAdrs($val, 'name'));
+            $mailtpl->assign('bcc', $this->bcc );
+                    
+            if( isset($metas['ReplyTo']) )
+                foreach( $metas['ReplyTo'] as $val ) 
+                    $this->AddReplyTo($this->decAdrs($val, 'addresse'), $this->decAdrs($val, 'name'));
+            $mailtpl->assign('ReplyTo', $this->ReplyTo );
+            
+            $this->Body = $mailtpl->fetch( $this->BodyTpl );
+            
+        }
-
-        if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
-        {