add support for qmail-inject (qmail-inject doesn't accept -t param)

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

diff --git a/functions/smtp.php b/functions/smtp.php
index fd179db65baecbf0225982ee74d38bf5c4f5c08c..3bd9d4d20572dfc1a941e40e23b01d20b2bd8a34 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -338,9 +338,13 @@
       $envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
       $envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
 
-      // open pipe to sendmail
-      $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w');
-      
+      // open pipe to sendmail or qmail-inject (qmail-inject doesn't accept -t param)
+      if (strstr($sendmail_path, "qmail-inject")) {
+         $fp = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");
+      } else {
+         $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w");
+      }
+
       $headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers);
       $bodylength = writeBody($fp, $body);