Changeset eebfa5e in github

Timestamp:

May 25, 2009 7:34:51 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

1e10700

Parents:

12f0572

Message:

• small LF fix in quoted-printable convertion

File:

• program/lib/imap.inc (modified) (5 diffs)

program/lib/imap.inc

@@ -2397 +2397 @@
                                 $bytes -= strlen($line);
 
-                                $line = rtrim($line, "\t\r\n\0\x0B");
-
                                 if ($mode == 1) {
+                                        $line = rtrim($line, "\t\r\n\0\x0B");
                                         // create chunks with proper length for base64 decoding
                                         $line = $prev.$line;
@@ -2418 +2417 @@
                                                 $result .= base64_decode($line);
                                 } else if ($mode == 2) {
-                                        $line .= $line[sizeof($line)-1] != '=' ? "\n" : '';
+                                        $line = rtrim($line, "\t\r\0\x0B");
                                         if ($file)
                                                 fwrite($file, quoted_printable_decode($line));
@@ -2426 +2425 @@
                                                 $result .= quoted_printable_decode($line);
                                 } else if ($mode == 3) {
+                                        $line = rtrim($line, "\t\r\n\0\x0B");
                                         if ($line == 'end' || preg_match('/^begin\s+[0-7]+\s+.+$/', $line))
                                                 continue;
@@ -2435 +2435 @@
                                                 $result .= convert_uudecode($line);
                                 } else {
+                                        $line = rtrim($line, "\t\r\n\0\x0B");
                                         if ($file)
                                                 fwrite($file, $line . "\n");
@@ -2444 +2445 @@
                         }
                 }
+
                 // read in anything up until last line
                 if (!$end)