- Don't trim spaces from the end of line when converting to format=flowed

alecpl

2010-09-10 618cb0d8dde52c2c8a181334e7a3c33fbc26c236

 program/include/rcube_message.php

@@ -393,6 +393,17 @@
                else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
                    $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification'
                ) {
                    // Allow plugins to handle also this part
                    $plugin = $this->app->plugins->exec_hook('message_part_structure',
                        array('object' => $this, 'structure' => $mail_part,
                            'mimetype' => $part_mimetype, 'recursive' => true));

                    if ($plugin['abort'])
                        continue;

                    $mail_part = $plugin['structure'];
                    list($primary_type, $secondary_type) = explode('/', $plugin['mimetype']);

                    // add text part if it matches the prefs
                    if (!$this->parse_alternative ||
                        ($secondary_type == 'html' && $this->opt['prefer_html']) ||
@@ -610,7 +621,7 @@
        foreach (preg_split('/\r?\n/', trim($text)) as $line) {
            // don't wrap quoted lines (to avoid wrapping problems)
            if ($line[0] != '>')
                $line = rc_wordwrap(rtrim($line), $length - 1, " \r\n");
                $line = rc_wordwrap(rtrim($line, "\r\n"), $length - 1, " \r\n");

            $out .= $line . "\r\n";
        }