From: jmunro <jmunro@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 29 Jul 2002 05:16:53 +0000 (+0000)
Subject: fix for bug #585836
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85dcc3fbfda74fed100bfe8e0f09a50a7dff7009;p=squirrelmail.git

fix for bug #585836


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

diff --git a/functions/smtp.php b/functions/smtp.php
index 1ae2cbfa..f04200a8 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -158,18 +158,16 @@ function attachFiles ($fp, $session, $rn="\r\n") {
                         if ($rn == "\r\n"){
                             $tmp = str_replace("\n", "\r\n", $tmp);
                         }
-                        /**
-                         * Check if the last line has newline ($rn) in it
-                         * and append if it doesn't.
-                         */
-                        if ($file && feof($file) && !strstr($tmp, "$rn")){
-                            $tmp .= $rn;
-                        }
                         if ($fp) {
                             fputs($fp, $tmp);
                         }
                         $length += strlen($tmp);
                     }
+                    if (substr($tmp, strlen($tmp) - strlen($rn), strlen($rn)) != $rn) {
+                        if ($fp) {
+                            fputs($fp, $rn);
+                        }
+                    }
                 } else {
                     $header .= "Content-Transfer-Encoding: base64" 
                         . "$rn" . "$rn";