Changeset 94a99c1 in github

Timestamp:

Sep 23, 2008 3:46:25 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

07d3670

Parents:

e98809a

Message:

• fixed handling of apostrophes in filenames decoded according to rfc2231

File:

• program/include/rcube_imap.php (modified) (2 diffs)

program/include/rcube_imap.php

@@ -1058 +1058 @@
         $this->add_message_cache($cache_key, $msg_id, $headers, $struct);
       }
-      
+
     return $struct;
     }
@@ -1272 +1272 @@
     else if (!empty($filename_encoded)) {
       // decode filename according to RFC 2231, Section 4
-      list($filename_charset,, $filename_urlencoded) = split('\'', $filename_encoded);
-      $part->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
+      if (preg_match("/^([^']*)'[^']*'(.*)$/", $filename_encoded, $fmatches)) {
+        $filename_charset = $fmatches[1];
+        $filename_encoded = $fmatches[2];
+        }
+      $part->filename = rcube_charset_convert(urldecode($filename_encoded), $filename_charset);
       }
     }