better folding of header lines.

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

diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 15138c59aa1b80f7182ed1232cbe3c2396871646..57b17ad7d33c93bf2a7203035f7e51314b2a8750 100644 (file)
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -2,7 +2,7 @@
 /**
  * Deliver_SendMail.class.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Delivery backend for the Deliver class.
@@ -16,7 +16,7 @@ class Deliver_SendMail extends Deliver {
 
     function preWriteToStream(&$s) {
        if ($s) {
-         $s = str_replace(".\n",".\r\n",str_replace("\r\n", "\n", $s));
+         $s = str_replace("\r\n", "\n", $s);
        }
     }
     
@@ -25,9 +25,9 @@ class Deliver_SendMail extends Deliver {
        $from = $rfc822_header->from[0];
        $envelopefrom = $from->mailbox.'@'.$from->host;
        if (strstr($sendmail_path, "qmail-inject")) {
-           $stream = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");
+           $stream = popen (escapeshellcmd("$sendmail_path -i -f$envelopefrom"), "w");
        } else {
-           $stream = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w");
+           $stream = popen (escapeshellcmd("$sendmail_path -i -t -f$envelopefrom"), "w");
        }
        return $stream;
     }