qmail-inject does not support -i option. Thanks to Ken Brush for report

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

diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 184dab9399eb2c3a5ddcd7947438168d5b9ec238..109a5d30b9a5828535bd7801ecba0c6ab18fe0f8 100644 (file)
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -55,7 +55,7 @@ class Deliver_SendMail extends Deliver {
        $envelopefrom = trim($from->mailbox.'@'.$from->host);
         $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom);
        if (strstr($sendmail_path, "qmail-inject")) {
        $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 -i -f$envelopefrom"), "w");
+           $stream = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");

        } else {
            $stream = popen (escapeshellcmd("$sendmail_path -i -t -f$envelopefrom"), "w");
        }
        } else {
            $stream = popen (escapeshellcmd("$sendmail_path -i -t -f$envelopefrom"), "w");
        }