diff options
| author | thomascube <thomas@roundcube.net> | 2006-02-04 19:08:10 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2006-02-04 19:08:10 +0000 |
| commit | 58e3602a37cccab55f71fbf839b32fbc4322699c (patch) | |
| tree | 4f48f72eb95d6ad7fb69ac09644e96f890bfded8 /program/steps/mail/compose.inc | |
| parent | 76ffa2a099300325b34c92a9291dc4031b8a0d8a (diff) | |
Bugfixes for encoding and sending with attachments
Diffstat (limited to 'program/steps/mail/compose.inc')
| -rw-r--r-- | program/steps/mail/compose.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 80a32a9f3..80f69b596 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -145,8 +145,10 @@ function rcmail_compose_headers($attrib) // get recipent address(es) out of the message headers if ($header=='to' && $REPLY_MESSAGE['headers']->replyto) $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->replyto); + else if ($header=='to' && $REPLY_MESSAGE['headers']->from) $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->from); + // add recipent of original message if reply to all else if ($header=='cc' && $REPLY_MESSAGE['reply_all']) { @@ -169,7 +171,7 @@ function rcmail_compose_headers($attrib) $fvalue = ''; foreach ($to_addresses as $addr_part) { - if (!in_array($addr_part['mailto'], $sa_recipients)) + if (!in_array($addr_part['mailto'], $sa_recipients) && (!$REPLY_MESSAGE['FROM'] || !in_array($addr_part['mailto'], $REPLY_MESSAGE['FROM']))) { $fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string']; $sa_recipients[] = $addr_part['mailto']; @@ -214,6 +216,8 @@ function rcmail_compose_header_from($attrib) $a_recipients = array(); if ($REPLY_MESSAGE && is_object($REPLY_MESSAGE['headers'])) { + $REPLY_MESSAGE['FROM'] = array(); + $a_to = $IMAP->decode_address_list($REPLY_MESSAGE['headers']->to); foreach ($a_to as $addr) { @@ -259,6 +263,9 @@ function rcmail_compose_header_from($attrib) // set identity if it's one of the reply-message recipients if (in_array($sql_arr['email'], $a_recipients)) $from_id = $sql_arr['identity_id']; + + if ($REPLY_MESSAGE && is_array($REPLY_MESSAGE['FROM'])) + $REPLY_MESSAGE['FROM'][] = $sql_arr['email']; } // overwrite identity selection with post parameter |