Make an exception for email addresses in case of folding Header lines.

[squirrelmail.git] / class / deliver / Deliver.class.php

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 2b5df58107eb16263b7e6a8a2e945a19bdedaeac..059c6f52cbe24cdcb75200ce3855e7a6b9d2fd96 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -409,26 +409,26 @@ class Deliver {
         }
         $header[] = "Date: $date" . $rn;
         $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
-        $header[] = 'From: '. $rfc822_header->getAddr_s('from',',',true) . $rn;
+        $header[] = 'From: '. $rfc822_header->getAddr_s('from',", \r\n",true) . $rn;
         /* RFC2822 if from contains more then 1 address */
         if (count($rfc822_header->from) > 1) {
-            $header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',',',true) . $rn;
+            $header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',", \r\n",true) . $rn;
         }
         if (count($rfc822_header->to)) {
-            $header[] = 'To: '. $rfc822_header->getAddr_s('to',',',true) . $rn;
+            $header[] = 'To: '. $rfc822_header->getAddr_s('to',", \r\n",true) . $rn;
         }
         if (count($rfc822_header->cc)) {
-            $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',',',true) . $rn;
+            $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',", \r\n",true) . $rn;
         }
         if (count($rfc822_header->reply_to)) {
-            $header[] = 'Reply-To: '. $rfc822_header->getAddr_s('reply_to',',',true) . $rn;
+            $header[] = 'Reply-To: '. $rfc822_header->getAddr_s('reply_to',", \r\n",true) . $rn;
         }
         /* Sendmail should return true. Default = false */
         $bcc = $this->getBcc();
         if (count($rfc822_header->bcc)) {
-            $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',',',true) . $rn;
+            $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',", \r\n",true) . $rn;
             if (!$bcc) {
-                $s = $this->foldLine($s, 78, str_pad('',4));
+                // $s = $this->foldLine($s, 78, str_pad('',4));
                 $raw_length += strlen($s);
             } else {
                 $header[] = $s;
@@ -485,6 +485,12 @@ class Deliver {
             {
             case 'Message-ID':
             case 'In-Reply_To':
+            case 'To':
+            case 'Cc':
+            case 'Bcc':
+            case 'From':
+            case 'Sender':
+            case 'Reply-To':
                 $hdr_s .= $header[$i];
                 break;
             case 'References':