Ticket #530: jmailer.2.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 +352 @@
-        $this->ReplyTo[$cur][0] = trim($address);
-        $this->ReplyTo[$cur][1] = $name;
-    }
+    
+    function name_addr( $adresse, $type = 'addresse' ) {
+        
+        if( strpos($adresse, '<') === true ) {
+            $tab = explode('>', $adresse);
+            $tab = explode('<', $tab[1]);
+            if( $type == 'addresse' && isset($tab[1]) ) return $tab[1];
+            if( $type == 'name') return $tab[0];
+        }
+        else if( $type == 'name' ) return '';
+        else if( $type == 'addresse' ) return $adresse;
+        
+    }
-
+    /**
+     * Adds a Tpl référence.
+     * @param string $selector
+     * @return void
+     */
+    function Tpl( $selector ) {
+        
+        $this->bodyTpl = $selector;
+        
+    }
-
-    /////////////////////////////////////////////////
-    // MAIL SENDING METHODS
@@ -361 +391 @@
-        $header = "";
-        $body = "";
-        $result = true;
+        
+        if( isset($this->bodyTpl) && $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->name_addr( $metas['From'], 'addresse' );
+                $this->FromName = $this->name_addr( $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->name_addr($val, 'addresse'), $this->name_addr($val, 'name'));
+            $mailtpl->assign('to', $this->to );
+                    
+            if( isset($metas['cc']) )
+                foreach( $metas['cc'] as $val ) 
+                    $this->AddCC($this->name_addr($val, 'addresse'), $this->name_addr($val, 'name'));
+            $mailtpl->assign('cc', $this->cc );
+                    
+            if( isset($metas['bcc']) )
+                foreach( $metas['bcc'] as $val ) 
+                    $this->AddBCC($this->name_addr($val, 'addresse'), $this->name_addr($val, 'name'));
+            $mailtpl->assign('bcc', $this->bcc );
+                    
+            if( isset($metas['ReplyTo']) )
+                foreach( $metas['ReplyTo'] as $val ) 
+                    $this->AddReplyTo($this->name_addr($val, 'addresse'), $this->name_addr($val, 'name'));
+            $mailtpl->assign('ReplyTo', $this->ReplyTo );
+            
+            $this->Body = $mailtpl->fetch( $this->bodyTpl );
+            
+        }
-
-        if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
-        {
@@ -445 +522 @@
-            $rt = @mail($to, $this->EncodeHeader($this->Subject), $body,
-                        $header, $params);
-        }
-
-
+
+
+
+
+
+
+
-
-        if (isset($old_from))
-            ini_set("sendmail_from", $old_from);
-
-        if(!$rt)
-        {
-            throw new jException('jelix~errors.mail.instantiate');
-        }
-
-        return true;
-    }
-