Fixed bug #17314: Swift_RfcComplianceException is always thrown in t3lib_formmail...
authorbaschny <baschny@709f56b5-9817-0410-a4d7-c38de5d9e867>
Wed, 23 Feb 2011 10:47:45 +0000 (10:47 +0000)
committerbaschny <baschny@709f56b5-9817-0410-a4d7-c38de5d9e867>
Wed, 23 Feb 2011 10:47:45 +0000 (10:47 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10586 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_formmail.php

index 38bd34e..5736bac 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-23  Ernesto Baschny  <ernst@cron-it.de>
+       * Fixed bug #17314: Swift_RfcComplianceException is always thrown in t3lib_formmail when forceReturnPath=1 is set
+
 2011-02-23  Tolleiv Nietsch  <typo3@tolleiv.de>
 
        * Fixed bug #17511: tx_install_session::write doesn't fix permissions
index 5554ebb..3ad5675 100644 (file)
@@ -73,7 +73,6 @@ class t3lib_formmail {
        /** @var t3lib_mail_Message */
        protected $mailMessage;
        protected $recipient;
-       protected $returnPath;
        protected $plainContent = '';
 
        /** @var array Files to clean up at the end (attachments) */
@@ -105,12 +104,6 @@ class t3lib_formmail {
 
                $this->mailMessage = t3lib_div::makeInstance('t3lib_mail_Message');
 
-               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['forceReturnPath']) {
-                       $this->returnPath = $GLOBALS['TYPO3_CONF_VARS']['SYS']['forceReturnPath'];
-                       $this->mailMessage->setReturnPath($this->returnPath);
-               }
-               $this->mailMessage->getHeaders()->addTextHeader('X-Mailer', 'TYPO3');
-
                if ($GLOBALS['TSFE']->config['config']['formMailCharset']) {
                                // Respect formMailCharset if it was set
                        $this->characterSet = $GLOBALS['TSFE']->csConvObj->parse_charset($GLOBALS['TSFE']->config['config']['formMailCharset']);
@@ -328,9 +321,6 @@ class t3lib_formmail {
                                        ->setSubject($theParts[0])
                                        ->setFrom($this->recipient)
                                        ->setBody($theParts[1]);
-                       if ($this->returnPath) {
-                               $autoRespondMail->setReturnPath($this->returnPath);
-                       }
                        $autoRespondMail->send();
                }
                return $this->mailMessage->isSent();