From 71b787fbdde73bd33e16ae143db8470d878de19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <130731+oerdnj@users.noreply.github.com> Date: Tue, 30 Oct 2001 13:43:09 +0000 Subject: [PATCH] add support for qmail-inject (qmail-inject doesn't accept -t param) --- functions/smtp.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/functions/smtp.php b/functions/smtp.php index fd179db65..3bd9d4d20 100644 --- 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);