summaryrefslogtreecommitdiff
path: root/program/steps/mail/compose.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-05-20 21:28:30 +0000
committerthomascube <thomas@roundcube.net>2010-05-20 21:28:30 +0000
commit6b6f2e83de0e5b48ba48583206bd456508554540 (patch)
tree4d687f9dbd86fb24a1c86703340c19aa7927fc28 /program/steps/mail/compose.inc
parente93c72d9a378903502fa51452d6db3fffc3a9b28 (diff)
Display and send messages with format=flowed (#1484370), fixes word wrapping issues (#1486543)
Diffstat (limited to 'program/steps/mail/compose.inc')
-rw-r--r--program/steps/mail/compose.inc27
1 files changed, 5 insertions, 22 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 50f11a361..0b18d122a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -134,7 +134,7 @@ else
$OUTPUT->set_env('show_sig', false);
// set line length for body wrapping
-$LINE_LENGTH = $RCMAIL->config->get('line_length', 75);
+$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);
if (!empty($msg_uid))
{
@@ -597,30 +597,13 @@ function rcmail_create_reply_body($body, $bodyIsHtml)
$body = substr($body, 0, max(0, $sp-1));
}
- // soft-wrap message first
- $body = rcmail_wrap_quoted($body, $LINE_LENGTH);
-
- $body = rtrim($body, "\r\n");
-
- if ($body) {
- // split body into single lines
- $a_lines = preg_split('/\r?\n/', $body);
-
- // add > to each line
- for ($n=0; $n<sizeof($a_lines); $n++) {
- if (strpos($a_lines[$n], '>')===0)
- $a_lines[$n] = '>'.$a_lines[$n];
- else
- $a_lines[$n] = '> '.$a_lines[$n];
- }
-
- $body = join("\n", $a_lines);
- }
+ // soft-wrap and quote message text
+ $body = rcmail_wrap_and_quote(rtrim($body, "\r\n"), $LINE_LENGTH);
// add title line(s)
- $prefix = rc_wordwrap(sprintf("On %s, %s wrote:\n",
+ $prefix = sprintf("On %s, %s wrote:\n",
$MESSAGE->headers->date,
- $MESSAGE->get_header('from')), $LINE_LENGTH);
+ $MESSAGE->get_header('from'));
$suffix = '';