Fix nbsps appearing in attachment name when composing/forwarding a message, and chang...

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

diff --git a/src/compose.php b/src/compose.php
index b78f0b72a9b59cf8503510d251507ab67f7b2873..4c8411748407f3c1d69039068cdfc080621a8d7e 100644 (file)
--- 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(' ', ' ', 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