X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=b04b47383a4417afe74473915c5e32522f94ca6d;hb=783e926eb2c99b6a55bdf774b64afa7828e5732b;hp=378f43c3a7d1c1732a25e8bb33911f21feb9560b;hpb=cd60d6082e0060ed5d5182baa24e1cab6db5ad05;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 378f43c3..b04b4738 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -255,11 +255,12 @@ function SendMDN ( $mailbox, $passed_id, $message, $imapConnection) { } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $pop_before_smtp; + global $smtpServerAddress, $smtpPort, $pop_before_smtp, $pop_before_smtp_host; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; + if (empty($pop_before_smtp_host)) $pop_before_smtp_host = $smtpServerAddress; get_smtp_user($user, $pass); $stream = $deliver->initStream($composeMessage,$domain,0, - $smtpServerAddress, $smtpPort, $user, $pass, $authPop); + $smtpServerAddress, $smtpPort, $user, $pass, $authPop, $pop_before_smtp_host); } $success = false; if ($stream) {