diff options
| author | alecpl <alec@alec.pl> | 2010-03-11 14:05:13 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-03-11 14:05:13 +0000 |
| commit | a4cf4577b1992b30f5d58b2c9b14a0210c39fac0 (patch) | |
| tree | 2f2fcab80bb56c5f8813f6cdc64e116cec2488f9 | |
| parent | aaf8255d18715c44eb29584553d7ed32edcc2934 (diff) | |
- Fix forwarding message omits CC header (#1486305)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 8 |
2 files changed, 9 insertions, 0 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix forwarding message omits CC header (#1486305) - Add 'default_charset' option to user preferences (#1485451) - Add 'delete_always' option to user preferences - Support/Require tls:// prefix in 'smtp_server' option for TLS connections diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 3a63cc8fc..36a352955 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -621,8 +621,12 @@ function rcmail_create_forward_body($body, $bodyIsHtml) $prefix .= 'Date: ' . $MESSAGE->headers->date . "\n"; $prefix .= 'From: ' . $MESSAGE->get_header('from') . "\n"; $prefix .= 'To: ' . $MESSAGE->get_header('to') . "\n"; + + if ($MESSAGE->headers->cc) + $prefix .= 'Cc: ' . $MESSAGE->get_header('cc') . "\n"; if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from) $prefix .= 'Reply-To: ' . $MESSAGE->get_header('replyto') . "\n"; + $prefix .= "\n"; } else @@ -644,6 +648,10 @@ function rcmail_create_forward_body($body, $bodyIsHtml) htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()), htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset())); + if ($MESSAGE->headers->cc) + $prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Cc: </th><td>%s</td></tr>", + htmlspecialchars(Q($MESSAGE->get_header('cc'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset())); + if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from) $prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Reply-To: </th><td>%s</td></tr>", htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset())); |