Allow a different server address for the POP server to be configured when using POP...

[squirrelmail.git] / functions / compose.php

diff --git a/functions/compose.php b/functions/compose.php
index f36d40bdc11c54ef0fbf12c99ca11dccf6b573ec..5839a592e369ca2e6c7a62c198f1e768663ce0a4 100644 (file)
--- a/functions/compose.php
+++ b/functions/compose.php
@@ -93,10 +93,8 @@ function sq_get_attach_tempfile()
 function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
 {
 
-   require_once(SM_PATH . 'class/mime/Message.class.php');
-   require_once(SM_PATH . 'class/mime/Rfc822Header.class.php');
-   require_once(SM_PATH . 'class/mime/ContentType.class.php');
-   require_once(SM_PATH . 'class/mime/AddressStructure.class.php');
+   require_once(SM_PATH . 'functions/mime.php');
+   require_once(SM_PATH . 'class/mime.class.php');
 
    if (empty($message))
    {
@@ -132,14 +130,16 @@ function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
    if (!$useSendmail) {
       require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
       $deliver = new Deliver_SMTP();
-      global $smtpServerAddress, $smtpPort, $pop_before_smtp, $domain;
+      global $smtpServerAddress, $smtpPort, $pop_before_smtp,
+             $domain, $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;
       $user = '';
       $pass = '';
       get_smtp_user($user, $pass);
       $stream = $deliver->initStream($message,$domain,0,
-                $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
+                $smtpServerAddress, $smtpPort, $user, $pass, $authPop, $pop_before_smtp_host);
    } else {
       require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
       global $sendmail_path, $sendmail_args;