Finally fixes de escaping '.' with sendmail. Sendmail supports the option -i

and with that option set we don't have to escape.

Thnx to Cor Bosman the issue is solved.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3810 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 15138c59aa1b80f7182ed1232cbe3c2396871646..f83c0cdd0552c7619bd5ba58fba3b17ddd0fdc29 100644 (file)
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -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;
     }