Fix for calls to Deliver_SMTP->initStream() having the wrong number of args.

This should fix authenticated smtp.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4103 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 69fab1d28c512a0c38bc24168e6d9b954350cc80..03f9124e9000b2c5d8111da74280807c153112b7 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1333,7 +1333,7 @@ function deliverMessage($composeMessage, $draft=false) {
        }
        $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
        $stream = $deliver->initStream($composeMessage,$domain,0,
-                         $smtpServerAddress, $smtpPort, $authPop);
+                         $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
     } elseif (!$draft) {
        require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
        global $sendmail_path;

diff --git a/src/read_body.php b/src/read_body.php
index a85361f8664bd48a488d01f41cc728dd4fca7bdb..cfab22a3eaad195379e04ac76e70026db59d7924 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -280,7 +280,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         }
         $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
         $stream = $deliver->initStream($composeMessage,$domain,0,
-                                       $smtpServerAddress, $smtpPort, $authPop);
+                                       $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
     }
     $success = false;
     if ($stream) {