fixed filename problem with attachments

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index fb996501d9158669df0eada5bcdd4e093294872f..1b66ba23f29ea103db22061218033e4df464a033 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -187,9 +187,23 @@
                $header["CHARSET"] = "us-ascii";
             }
 
+         }
+
+         else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {   
+            /** Add better dontent-disposition support **/
+            
+            $line = $read[$i];
+            $i++;
+            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
+               str_replace("\n", "", $line);
+               str_replace("\n", "", $read[$i]);
+               $line = "$line $read[$i]";
+               $i++;
+            }
+
             /** Detects filename if any **/
-            if (strpos(strtolower(trim($line)), "name=")) {
-               $pos = strpos($line, "name=") + 5;
+            if (strpos(strtolower(trim($line)), "filename=")) {
+               $pos = strpos($line, "filename=") + 9;
                $name = trim($line);
                if (strpos($line, " ", $pos) > 0) {
                   $name = substr($name, $pos, strpos($line, " ", $pos));