Changeset 2280 in subversion

Timestamp:

Feb 6, 2009 2:04:45 PM (4 years ago)

Author:

alec

Message:

• Fix some base64 encoded attachments handling (#1485725)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -6 +6 @@
 - Fix pressing select all/unread multiple times (#1485723)
 - Fix selecting all unread does not honor new messages (#1485724)
+- Fix some base64 encoded attachments handling (#1485725)
 
 2009/02/05 (alec)

trunk/roundcubemail/program/lib/imap.inc

@@ -2509 +2509 @@
                         $sizeStr  = substr($line, $from, $len);
                         $bytes    = (int)$sizeStr;
-
+                        $prev     = '';
+                        
                         while ($bytes > 0) {
                                 $line      = iil_ReadLine($fp, 1024);
@@ -2519 +2520 @@
                                 $bytes -= strlen($line);
 
+                                $line = rtrim($line, "\t\r\n\0\x0B");
+
                                 if ($mode == 1) {
                                         if ($file)
-                                                fwrite($file, rtrim($line, "\t\r\n\0\x0B") . "\n");
+                                                fwrite($file, $line . "\n");
                                         else
-                                                $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
+                                                $result .= $line . "\n";
                                 } else if ($mode == 2) {
-                                        echo rtrim($line, "\t\r\n\0\x0B") . "\n";
+                                        echo $line . "\n";
                                 } else if ($mode == 3) {
+                                        // create chunks with proper length for base64 decoding
+                                        $line = $prev.$line;
+                                        $length = strlen($line);
+                                        if ($length % 4) {
+                                                $length = floor($length / 4) * 4;
+                                                $prev = substr($line, $length);
+                                                $line = substr($line, 0, $length);
+                                        }
+                                        else
+                                                $prev = '';
+
                                         if ($file)
                                                 fwrite($file, base64_decode($line));