From 5a1f1da3938a8a712eeec08d72ee39c19e540566 Mon Sep 17 00:00:00 2001
From: alex-brainstorm <alex-brainstorm@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 4 Sep 2003 02:22:25 +0000
Subject: [PATCH] Fix nbsps appearing in attachment name when
 composing/forwarding a message, and change message file suffix from .eml to
 .msg (as in download.php) so they are not bounced by email filters (eg sf).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5619 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/compose.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/compose.php b/src/compose.php
index b78f0b72..4c841174 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -769,9 +769,9 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
            switch ($message->type0) {
            case 'message':
                 if ($message->type1 == 'rfc822') {
-                    $filename = $message->rfc822_header->subject.'.eml';
+                    $filename = $message->rfc822_header->subject.'.msg';
                     if ($filename == "") {
-                        $filename = "untitled-".$message->entity_id.'.eml';
+                        $filename = "untitled-".$message->entity_id.'.msg';
                     }
                  } else {
                    $filename = $message->getFilename();
@@ -784,7 +784,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
              $filename = $message->getFilename();
              break;
            }
-           $filename = decodeHeader($filename);
+           $filename = str_replace('&nbsp;', ' ', decodeHeader($filename));
            if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
                function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
                 $filename =  $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
@@ -842,7 +842,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
         $fp = fopen($full_localfilename, 'w');
         fwrite ($fp, $body);
         fclose($fp);
-        $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+        $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
                          $full_localfilename);
     }
     return $composeMessage;
@@ -1510,4 +1510,4 @@ function deliverMessage($composeMessage, $draft=false) {
     return $succes;
 }
 
-?>
+?>
\ No newline at end of file
-- 
2.25.1