<HTML> tag placement fix

[squirrelmail.git] / functions / smtp.php
diff --git a/functions/smtp.php b/functions/smtp.php

index 903ec0157e7bcfc349bbdcb771382b2245e66920..1ae2cbfad26423269c3bcfc331743dd8e51b8bc2 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -147,8 +147,10 @@ function attachFiles ($fp, $session, $rn="\r\n") {
                  $file = fopen ($filename, 'rb');
                  if (substr($filetype, 0, 5) == 'text/' ||
                      substr($filetype, 0, 8) == 'message/' ) {
-                    $header .= "$rn";
-                                       if ($fp) fputs ($fp, $header);
+                    $header .= $rn;
+                                       if ($fp) {
+                                           fputs ($fp, $header);
+                                       }
                      $length += strlen($header);
                      while ($tmp = fgets($file, 4096)) {
                          $tmp = str_replace("\r\n", "\n", $tmp);
@@ -160,10 +162,12 @@ function attachFiles ($fp, $session, $rn="\r\n") {
                           * Check if the last line has newline ($rn) in it
                           * and append if it doesn't.
                           */
-                        if (feof($fp) && !strstr($tmp, "$rn")){
-                            $tmp .= "$rn";
+                        if ($file && feof($file) && !strstr($tmp, "$rn")){
+                            $tmp .= $rn;
+                        }
+                        if ($fp) {
+                            fputs($fp, $tmp);
                          }
-                        if ($fp) fputs($fp, $tmp);
                          $length += strlen($tmp);
                      }
                  } else {
@@ -775,7 +779,7 @@ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN,
      global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad,
          $data_dir, $username, $domain, $key, $version, $sent_folder, 
          $imapServerAddress, $imapPort, $default_use_priority, $more_headers, 
-        $request_mdn, $request_dr;
+        $request_mdn, $request_dr, $uid_support;
  
      $more_headers = Array();
      
@@ -793,7 +797,7 @@ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN,
           * The References header should really be the old Referenced header
           * with the message ID appended, and now it is (jmunro)
           */
-       $sid = sqimap_session_id(); 
+       $sid = sqimap_session_id($uid_support); 
         $query = "$sid FETCH $reply_id (BODY.PEEK[HEADER.FIELDS (Message-Id In-Reply-To)])\r\n";
         fputs ($imap_stream, $query);
         $read = sqimap_read_data($imap_stream, $sid, true, $response, $message);