[pLog-CVS] plog/class/mail emailmessage.class.php,1.3,1.3.2.1 emailservice.class.php,1.2,1.2.6.1

[Oscar R. <phu...@us...>]

Update of /cvsroot/plog/plog/class/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2533

Modified Files:
      Tag: PLOG_0_3_2_DEVEL
	emailmessage.class.php emailservice.class.php 
Log Message:
merged reto's patches


Index: emailservice.class.php
===================================================================
RCS file: /cvsroot/plog/plog/class/mail/emailservice.class.php,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -C2 -d -r1.2 -r1.2.6.1
*** emailservice.class.php	20 Jan 2004 18:44:06 -0000	1.2
--- emailservice.class.php	1 May 2004 13:09:45 -0000	1.2.6.1
***************
*** 13,17 ****
       * libraries and those must be enabled.
       */
!     class EmailService extends Object {
  
      	var $_config;
--- 13,18 ----
       * libraries and those must be enabled.
       */
!     class EmailService extends Object 
!     {
  
      	var $_config;
***************
*** 45,48 ****
--- 46,50 ----
              // set a few fields
              $mail->From     = $message->getFrom();
+             $mail->FromName = $message->getFromName();
              $mail->Subject  = $message->getSubject();
              $mail->Body     = $message->getBody();
***************
*** 122,129 ****
  
              // we have set up everything, send the mail
!             if( !$mail->Send()) {
!             	throw( new Exception( "Error sending message: ".$mail->ErrorInfo ));
!                 die();
!             }
          }
      }
--- 124,128 ----
  
              // we have set up everything, send the mail
!             return( $mail->Send());
          }
      }

Index: emailmessage.class.php
===================================================================
RCS file: /cvsroot/plog/plog/class/mail/emailmessage.class.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** emailmessage.class.php	6 Apr 2004 15:53:38 -0000	1.3
--- emailmessage.class.php	1 May 2004 13:09:45 -0000	1.3.2.1
***************
*** 8,12 ****
       * Represents an email message.
       */
!     class EmailMessage extends Object {
  
      	var $_toAddrs;
--- 8,13 ----
       * Represents an email message.
       */
!     class EmailMessage extends Object 
!     {
  
      	var $_toAddrs;
***************
*** 16,19 ****
--- 17,23 ----
          var $_body;
          var $_mimeType;
+         var $_from;
+         var $_fromName;
+         
  
      	/**
***************
*** 71,74 ****
--- 75,88 ----
          }
  
+         /**
+          * Sets the from name
+          *
+          * @param fromname The originatory name
+          */
+         function setFromName( $fromname )
+         {
+         	$this->_fromName = $fromname;
+         }        
+ 
          /**
           * Sets the subject of the message
***************
*** 170,173 ****
--- 184,197 ----
          	return $this->_mimeType;
          }
+         
+        /**
+          * Returns the From name.
+          *
+          * @return The from name.
+          */
+         function getFromName()
+         {
+         	return $this->_fromName;
+         }        
      }
  ?>