Changeset 1044

Timestamp:

07/24/08 08:34:01 (4 months ago)

Author:

bastnic

Message:

fixed #530 : improvement in jMailer, p=lipki

Files:

• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/utils/jMailer.class.php (modified) (4 diffs)

trunk/lib/jelix/CREDITS

@@ -57 +57 @@
- - trois plugin swf (#498)
- - plugin coord history (#507)
+ - improvement in jMailer (#530)
-
-Loic Mathaud (bballizlife):

trunk/lib/jelix/utils/jMailer.class.php

@@ -12 +12 @@
-* @subpackage  utils
-* @author      Brent R. Matzelle
-
+, Kévin Lepeltier
-* @copyright   2001 - 2003  Brent R. Matzelle, 2006 Laurent Jouanneau
+* @copyright   2008 Kévin Lepeltier
-* @link        http://www.jelix.org
-* @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -85 +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;
-
-    /**
@@ -346 +354 @@
-        $this->ReplyTo[$cur][1] = $name;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /////////////////////////////////////////////////
@@ -362 +394 @@
-        $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']) ) {
+                $adr = $this->getAddrName( $metas['From'] );
+                $this->From = $adr[1];
+                $this->FromName = $adr[0];
+            }
+            $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->to[] = $this->getAddrName( $val );
+            $mailtpl->assign('to', $this->to );
+                    
+            if( isset($metas['cc']) )
+                foreach( $metas['cc'] as $val )
+                    $this->cc[] = $this->getAddrName( $val );
+            $mailtpl->assign('cc', $this->cc );
+                    
+            if( isset($metas['bcc']) )
+                foreach( $metas['bcc'] as $val )
+                    $this->bcc[] = $this->getAddrName( $val );
+            $mailtpl->assign('bcc', $this->bcc );
+                    
+            if( isset($metas['ReplyTo']) )
+                foreach( $metas['ReplyTo'] as $val )
+                    $this->ReplyTo[] = $this->getAddrName( $val );
+            $mailtpl->assign('ReplyTo', $this->ReplyTo );
+            
+            $this->Body = $mailtpl->fetch( $this->bodyTpl );
+            
+        }
-
-        if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)