[phpBT-dev] CVS: phpbt bug.php,1.144,1.145 config-dist.php,1.35,1.36

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

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

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


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- bug.php	27 Aug 2005 13:14:28 -0000	1.144
+++ bug.php	8 Sep 2005 20:05:41 -0000	1.145
@@ -318,11 +318,12 @@
 		$mail = new htmlMimeMail();
 		$mail->setText($t->fetch($template));
 		$mail->setFrom(ADMIN_EMAIL);
+		$mail->setReturnPath(RETURN_PATH);
 		$mail->setSubject("[Bug {$buginfo['bug_id']}] ".
 			($newbug ? 'New' : 'Changed').' - '.
 				stripslashes((!empty($cf['title']) ? $cf['title'] : $buginfo['title'])));
 		if (SMTP_EMAIL) {
-			$mail->setSMTPParams(SMTP_HOST, SMTP_PORT, SMTP_HELO, SMTP_AUTH, SMTP_AUTH_USER, SMTP_AUTH_PASS, SMTP_SENDER);
+			$mail->setSMTPParams(SMTP_HOST, SMTP_PORT, SMTP_HELO, SMTP_AUTH, SMTP_AUTH_USER, SMTP_AUTH_PASS);
 		}
 		$mail->send($maillist, SMTP_EMAIL ? 'smtp' : 'mail');
 	}

Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-dist.php	29 Aug 2005 19:09:39 -0000	1.35
+++ config-dist.php	8 Sep 2005 20:05:41 -0000	1.36
@@ -78,7 +78,6 @@
 define('SMTP_AUTH', false);
 define('SMTP_AUTH_USER', "");
 define('SMTP_AUTH_PASS', "");
-// define('SMTP_SENDER', SMTP_AUTH_USER."@".SMTP_HELO);
-define('SMTP_SENDER', null);
+define('RETURN_PATH', null);
 
 ?>