[phpBT-dev] CVS: phpbt/inc/htmlMimeMail htmlMimeMail.php,1.4,1.5 smtp.php,1.3,1.4

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/htmlMimeMail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28332/inc/htmlMimeMail

Modified Files:
	htmlMimeMail.php smtp.php 
Log Message:
Reverting the SMTP_SENDER patch since this already exists in htmlMimeMail as return_path (which also works with 'mail')


Index: htmlMimeMail.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/htmlMimeMail/htmlMimeMail.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmlMimeMail.php	22 Aug 2005 20:54:43 -0000	1.4
+++ htmlMimeMail.php	8 Sep 2005 20:05:42 -0000	1.5
@@ -142,7 +142,6 @@
 		$this->smtp_params['auth'] = false;
 		$this->smtp_params['user'] = '';
 		$this->smtp_params['pass'] = '';
-		$this->smtp_params['sender'] = null;
 
 		/**
         * Make sure the MIME version header is first.
@@ -189,7 +188,7 @@
 /**
 * Accessor to set the SMTP parameters
 */
-	function setSMTPParams($host = null, $port = null, $helo = null, $auth = null, $user = null, $pass = null, $sender = null)
+	function setSMTPParams($host = null, $port = null, $helo = null, $auth = null, $user = null, $pass = null)
 	{
 		if (!is_null($host)) $this->smtp_params['host'] = $host;
 		if (!is_null($port)) $this->smtp_params['port'] = $port;
@@ -197,7 +196,6 @@
 		if (!is_null($auth)) $this->smtp_params['auth'] = $auth;
 		if (!is_null($user)) $this->smtp_params['user'] = $user;
 		if (!is_null($pass)) $this->smtp_params['pass'] = $pass;
-		if (!is_null($sender)) $this->smtp_params['sender'] = $sender;
 	}
 
 /**

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/htmlMimeMail/smtp.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smtp.php	22 Aug 2005 20:54:43 -0000	1.3
+++ smtp.php	8 Sep 2005 20:05:42 -0000	1.4
@@ -26,7 +26,6 @@
 		var $auth;
 		var $user;
 		var $pass;
-		var $sender;
 
 		/**
         * Constructor function. Arguments:
@@ -58,7 +57,6 @@
 			$this->auth				= FALSE;
 			$this->user				= '';
 			$this->pass				= '';
-			$this->sender				= null;
 			$this->errors   		= array();
 
 			foreach($params as $key => $value){
@@ -129,10 +127,7 @@
 						return FALSE;
 				}
 
-				$envelope_sender = $this->from;
-				if (!is_null($this->sender))
-					$envelope_sender = $this->sender;
-				$this->mail($envelope_sender);
+				$this->mail($this->from);
 				if(is_array($this->recipients))
 					foreach($this->recipients as $value)
 						$this->rcpt($value);