fixed syscp-bug #1185 (set correct Return-Path header);
This commit is contained in:
@@ -27,7 +27,6 @@ $mail = new PHPMailer();
|
|||||||
|
|
||||||
if((int)$settings['autoresponder']['autoresponder_active'] == 0)
|
if((int)$settings['autoresponder']['autoresponder_active'] == 0)
|
||||||
{
|
{
|
||||||
include ($pathtophpfiles . '/lib/cron_shutdown.php');
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,7 +198,6 @@ if($db->num_rows($result) > 0)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//send mail with mailer class
|
//send mail with mailer class
|
||||||
|
|
||||||
$mail->From = $to;
|
$mail->From = $to;
|
||||||
$mail->FromName = $to;
|
$mail->FromName = $to;
|
||||||
$mail->Subject = $row['subject'];
|
$mail->Subject = $row['subject'];
|
||||||
@@ -207,6 +205,9 @@ if($db->num_rows($result) > 0)
|
|||||||
$mail->AddAddress($from, $from);
|
$mail->AddAddress($from, $from);
|
||||||
$mail->AddCustomHeader('Precedence: bulk');
|
$mail->AddCustomHeader('Precedence: bulk');
|
||||||
|
|
||||||
|
// set correct return path
|
||||||
|
$mail->Sender = $to;
|
||||||
|
|
||||||
if(!$mail->Send())
|
if(!$mail->Send())
|
||||||
{
|
{
|
||||||
if($mail->ErrorInfo != '')
|
if($mail->ErrorInfo != '')
|
||||||
|
|||||||
Reference in New Issue
Block a user