fix for "untitled" attachment names

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

diff --git a/src/compose.php b/src/compose.php
index ef06f0110ab3cf7c3e3969f189a4df1a1baf02f1..190f1d62c40e0af30d5c88d1a3e8a2d6ff0405a1 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -614,8 +614,13 @@ function getAttachments($message, $session, $passed_id, $entities, $imapConnecti
                }
            } else {
                $filename = decodeHeader($message->header->getParameter('filename'));
-               if ($filename == "") {
-                  $filename = "untitled-".$message->entity_id;
+               if ($filename == '') {
+                 $name = decodeHeader($message->header->getParameter('name'));
+                 if ($name == '') {
+                     $filename = "untitled-".$message->entity_id;
+                 } else {
+                    $filename = $name;
+                 }
                }
             }
             $localfilename = GenerateRandomString(32, '', 7);