浏览代码

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

Ondřej Surý 24 年之前
父节点
当前提交
71b787fbdd
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      functions/smtp.php

+ 7 - 3
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);