0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ondřej Surý 2001-10-30 13:43:09 +00:00
parent 82628617d6
commit 71b787fbdd
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
functions/smtp.php
View file

@ -338,9 +338,13 @@
$envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom); $envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
$envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom); $envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
// open pipe to sendmail // open pipe to sendmail or qmail-inject (qmail-inject doesn't accept -t param)
$fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w'); 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); $headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers);
$bodylength = writeBody($fp, $body); $bodylength = writeBody($fp, $body);