better fix for bug #812690

[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 d44c2efcb2824ea12e0231ce1e1c12ca73fa77e8..d5c6fdbc679008d43cf3b9bb11dac820ac8f1272 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.
@@ -10,31 +10,37 @@
  * $Id$
  */
 
-require_once('../class/deliver/Deliver.class.php');
+require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 
 class Deliver_SendMail extends Deliver {
 
     function preWriteToStream(&$s) {
        if ($s) {
-          if ($s{0} == '.')   $s = '.' . $s;
-         $s = str_replace("\n.","\n..",$s);
-          $s = str_replace("\r\n", "\n", $s);
+         $s = str_replace("\r\n", "\n", $s);
        }
     }
     
     function initStream($message, $sendmail_path) {
         $rfc822_header = $message->rfc822_header;
        $from = $rfc822_header->from[0];
-       $envelopefrom = $from->mailbox.'@'.$from->host;
+       $envelopefrom = trim($from->mailbox.'@'.$from->host);
+       $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom);
        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;
     }
     
     function finalizeStream($stream) {
        pclose($stream);
+       return true;
     }
+    
+    function getBcc() {
+       return true;
+    }
+    
 }
 ?>