X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fcompose.inc;h=ca10898015720cc2e57be4c90e210a8fdf441294;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=71dcbba4779f3efc5d9366ff40eb05290a5d9d23;hpb=d326b0c67bb536d2296004c927e89ab8c4a548b5;p=roundcube.git diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 71dcbba..ca10898 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/mail/compose.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2011, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,455 +15,789 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: compose.inc 1039 2008-02-11 17:39:31Z till $ + $Id: compose.inc 5545 2011-12-05 12:59:21Z thomasb $ */ -require_once('Mail/mimeDecode.php'); -require_once('lib/html2text.inc'); - // define constants for message compose mode define('RCUBE_COMPOSE_REPLY', 0x0106); define('RCUBE_COMPOSE_FORWARD', 0x0107); define('RCUBE_COMPOSE_DRAFT', 0x0108); - - -// remove an attachment -if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs)) -{ - $id = $regs[1]; - if (is_array($_SESSION['compose']['attachments'][$id])) - { - @unlink($_SESSION['compose']['attachments'][$id]['path']); - $_SESSION['compose']['attachments'][$id] = NULL; - $OUTPUT->command('remove_from_attachment_list', "rcmfile$id"); - $OUTPUT->send(); - exit; - } +define('RCUBE_COMPOSE_EDIT', 0x0109); + +$MESSAGE_FORM = null; +$MESSAGE = null; +$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET); +$COMPOSE = null; + +if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID]) + $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID]; + +// give replicated session storage some time to synchronize +$retries = 0; +while ($COMPOSE_ID && !is_array($COMPOSE) && $RCMAIL->db->is_replicated() && $retries++ < 5) { + usleep(500000); + $RCMAIL->session->reload(); + if ($_SESSION['compose_data_'.$COMPOSE_ID]) + $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID]; } -if ($_action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs)) +// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or +// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab). +if (!is_array($COMPOSE)) { - $id = $regs[1]; - if (is_array($_SESSION['compose']['attachments'][$id])) - { - $apath = $_SESSION['compose']['attachments'][$id]['path']; - header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']); - header('Content-Length: ' . filesize($apath)); - readfile($apath); + // Infinite redirect prevention in case of broken session (#1487028) + if ($COMPOSE_ID) + raise_error(array('code' => 500, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Invalid compose ID"), true, true); + + $COMPOSE_ID = uniqid(mt_rand()); + $_SESSION['compose_data_'.$COMPOSE_ID] = array( + 'id' => $COMPOSE_ID, + 'param' => request2param(RCUBE_INPUT_GET), + 'mailbox' => $IMAP->get_mailbox_name(), + ); + $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID]; + + // process values like "mailto:foo@bar.com?subject=new+message&cc=another" + if ($COMPOSE['param']['to']) { + // #1486037: remove "mailto:" prefix + $COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $COMPOSE['param']['to']); + $mailto = explode('?', $COMPOSE['param']['to']); + if (count($mailto) > 1) { + $COMPOSE['param']['to'] = $mailto[0]; + parse_str($mailto[1], $query); + foreach ($query as $f => $val) + $COMPOSE['param'][$f] = $val; + } } - exit; -} -$MESSAGE_FORM = NULL; -$MESSAGE = NULL; + // select folder where to save the sent message + $COMPOSE['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox'); -// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or -// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab). -// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old -// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear + // pipe compose parameters thru plugins + $plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE); + $COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']); -if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET)) -{ - rcmail_compose_cleanup(); - $_SESSION['compose'] = array('id' => uniqid(rand())); + // add attachments listed by message_compose hook + if (is_array($plugin['attachments'])) { + foreach ($plugin['attachments'] as $attach) { + // we have structured data + if (is_array($attach)) { + $attachment = $attach; + } + // only a file path is given + else { + $filename = basename($attach); + $attachment = array( + 'group' => $COMPOSE_ID, + 'name' => $filename, + 'mimetype' => rc_mime_content_type($attach, $filename), + 'path' => $attach, + ); + } + + // save attachment if valid + if (($attachment['data'] && $attachment['name']) || ($attachment['path'] && file_exists($attachment['path']))) { + $attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment); + } + + if ($attachment['status'] && !$attachment['abort']) { + unset($attachment['data'], $attachment['status'], $attachment['abort']); + $COMPOSE['attachments'][$attachment['id']] = $attachment; + } + } + } + + // check if folder for saving sent messages exists and is subscribed (#1486802) + if ($sent_folder = $COMPOSE['param']['sent_mbox']) { + rcmail_check_sent_folder($sent_folder, true); + } + + // redirect to a unique URL with all parameters stored in session + $OUTPUT->redirect(array('_action' => 'compose', '_id' => $COMPOSE['id'])); } + // add some labels to client -rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting'); +$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel', + 'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage', + 'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany', + 'fileuploaderror', 'sendmessage'); + +$OUTPUT->set_env('compose_id', $COMPOSE['id']); -// add config parameter to client script -$OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0); +// add config parameters to client script +if (!empty($CONFIG['drafts_mbox'])) { + $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); + $OUTPUT->set_env('draft_autosave', $CONFIG['draft_autosave']); +} +// set current mailbox in client environment +$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name()); +$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false)); +$OUTPUT->set_env('top_posting', $RCMAIL->config->get('top_posting', false)); +$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ','))); +// use jquery UI for showing prompt() dialogs +$RCMAIL->plugins->load_plugin('jqueryui'); // get reference message and set compose mode -if ($msg_uid = get_input_value('_reply_uid', RCUBE_INPUT_GET)) +if ($msg_uid = $COMPOSE['param']['draft_uid']) { + $RCMAIL->imap->set_mailbox($CONFIG['drafts_mbox']); + $compose_mode = RCUBE_COMPOSE_DRAFT; +} +else if ($msg_uid = $COMPOSE['param']['reply_uid']) $compose_mode = RCUBE_COMPOSE_REPLY; -else if ($msg_uid = get_input_value('_forward_uid', RCUBE_INPUT_GET)) +else if ($msg_uid = $COMPOSE['param']['forward_uid']) $compose_mode = RCUBE_COMPOSE_FORWARD; -else if ($msg_uid = get_input_value('_draft_uid', RCUBE_INPUT_GET)) - $compose_mode = RCUBE_COMPOSE_DRAFT; - +else if ($msg_uid = $COMPOSE['param']['uid']) + $compose_mode = RCUBE_COMPOSE_EDIT; + +$config_show_sig = $RCMAIL->config->get('show_sig', 1); +if ($config_show_sig == 1) + $OUTPUT->set_env('show_sig', true); +else if ($config_show_sig == 2 && (empty($compose_mode) || $compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT)) + $OUTPUT->set_env('show_sig', true); +else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD)) + $OUTPUT->set_env('show_sig', true); +else + $OUTPUT->set_env('show_sig', false); + +// set line length for body wrapping +$LINE_LENGTH = $RCMAIL->config->get('line_length', 72); if (!empty($msg_uid)) { // similar as in program/steps/mail/show.inc - $MESSAGE = array('UID' => $msg_uid); - $MESSAGE['headers'] = &$IMAP->get_headers($msg_uid); - $MESSAGE['structure'] = &$IMAP->get_structure($msg_uid); - $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject); - $MESSAGE['parts'] = $IMAP->get_mime_numbers($MESSAGE['structure']); - + // re-set 'prefer_html' to have possibility to use html part for compose + $CONFIG['prefer_html'] = $CONFIG['prefer_html'] || $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT; + $MESSAGE = new rcube_message($msg_uid); + + // make sure message is marked as read + if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN'])) + $IMAP->set_flag($msg_uid, 'SEEN'); + + if (!empty($MESSAGE->headers->charset)) + $IMAP->set_charset($MESSAGE->headers->charset); + if ($compose_mode == RCUBE_COMPOSE_REPLY) { - $_SESSION['compose']['reply_uid'] = $msg_uid; - $_SESSION['compose']['reply_msgid'] = $MESSAGE['headers']->messageID; - $_SESSION['compose']['references'] = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID); + $COMPOSE['reply_uid'] = $msg_uid; + $COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID; + $COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID); - if (!empty($_GET['_all'])) - $MESSAGE['reply_all'] = 1; + if (!empty($COMPOSE['param']['all'])) + $MESSAGE->reply_all = $COMPOSE['param']['all']; + + $OUTPUT->set_env('compose_mode', 'reply'); + + // Save the sent message in the same folder of the message being replied to + if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox']) + && rcmail_check_sent_folder($sent_folder, false) + ) { + $COMPOSE['param']['sent_mbox'] = $sent_folder; + } + } + else if ($compose_mode == RCUBE_COMPOSE_DRAFT) + { + if ($MESSAGE->headers->others['x-draft-info']) + { + // get reply_uid/forward_uid to flag the original message when sending + $info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']); + + if ($info['type'] == 'reply') + $COMPOSE['reply_uid'] = $info['uid']; + else if ($info['type'] == 'forward') + $COMPOSE['forward_uid'] = $info['uid']; + + $COMPOSE['mailbox'] = $info['folder']; + + // Save the sent message in the same folder of the message being replied to + if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $info['folder']) + && rcmail_check_sent_folder($sent_folder, false) + ) { + $COMPOSE['param']['sent_mbox'] = $sent_folder; + } + } + + if ($MESSAGE->headers->in_reply_to) + $COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>'; + + $COMPOSE['references'] = $MESSAGE->headers->references; } else if ($compose_mode == RCUBE_COMPOSE_FORWARD) { - $_SESSION['compose']['forward_uid'] = $msg_uid; + $COMPOSE['forward_uid'] = $msg_uid; + $OUTPUT->set_env('compose_mode', 'forward'); + + if (!empty($COMPOSE['param']['attachment'])) + $MESSAGE->forward_attachment = true; } - else if ($compose_mode == RCUBE_COMPOSE_DRAFT) +} + +$MESSAGE->compose = array(); + +// get user's identities +$MESSAGE->identities = $USER->list_identities(); +if (count($MESSAGE->identities)) +{ + foreach ($MESSAGE->identities as $idx => $ident) { + $email = mb_strtolower(rcube_idn_to_utf8($ident['email'])); + + $MESSAGE->identities[$idx]['email_ascii'] = $ident['email']; + $MESSAGE->identities[$idx]['ident'] = format_email_recipient($ident['email'], $ident['name']); + $MESSAGE->identities[$idx]['email'] = $email; + } +} + +// Set From field value +if (!empty($_POST['_from'])) { + $MESSAGE->compose['from'] = get_input_value('_from', RCUBE_INPUT_POST); +} +else if (!empty($COMPOSE['param']['from'])) { + $MESSAGE->compose['from'] = $COMPOSE['param']['from']; +} +else if (count($MESSAGE->identities)) { + $a_recipients = array(); + $a_names = array(); + + // extract all recipients of the reply-message + if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD))) { - $_SESSION['compose']['draft_uid'] = $msg_uid; + $a_to = $IMAP->decode_address_list($MESSAGE->headers->to); + foreach ($a_to as $addr) { + if (!empty($addr['mailto'])) { + $a_recipients[] = strtolower($addr['mailto']); + $a_names[] = $addr['name']; + } + } + + if (!empty($MESSAGE->headers->cc)) { + $a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc); + foreach ($a_cc as $addr) { + if (!empty($addr['mailto'])) { + $a_recipients[] = strtolower($addr['mailto']); + $a_names[] = $addr['name']; + } + } + } + } + + $from_idx = null; + $default_identity = null; + $return_path = $MESSAGE->headers->others['return-path']; + + // Select identity + foreach ($MESSAGE->identities as $idx => $ident) { + // save default identity ID + if ($ident['standard']) { + $default_identity = $idx; + } + + // use From header + if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) { + if ($MESSAGE->headers->from == $ident['ident']) { + $from_idx = $idx; + break; + } + } + // reply to yourself + else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) { + $from_idx = $idx; + break; + } + // use replied message recipients + else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) { + // match identity name, prefer default identity + if ($from_idx === null || ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name'])) { + $from_idx = $idx; + } + } + } + + // Fallback using Return-Path + if ($from_idx === null && $return_path) { + foreach ($MESSAGE->identities as $idx => $ident) { + if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) { + $from_idx = $idx; + break; + } + } } + + // Still no ID, use default/first identity + if ($from_idx === null) { + $from_idx = $default_identity !== null ? $default_identity : key(reset($MESSAGE->identities)); + } + + $ident = $MESSAGE->identities[$from_idx]; + $from_id = $ident['identity_id']; + + $MESSAGE->compose['from_email'] = $ident['email']; + $MESSAGE->compose['from'] = $from_id; } -/****** compose mode functions ********/ +// Set other headers +$a_recipients = array(); +$parts = array('to', 'cc', 'bcc', 'replyto', 'followupto'); +$separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' '; + +foreach ($parts as $header) { + $fvalue = ''; + $decode_header = true; + + // we have a set of recipients stored is session + if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto']) + && $_SESSION['mailto'][$mailto_id] + ) { + $fvalue = urldecode($_SESSION['mailto'][$mailto_id]); + $decode_header = false; + + // make session to not grow up too much + unset($_SESSION['mailto'][$mailto_id]); + $COMPOSE['param']['to'] = $fvalue; + } + else if (!empty($_POST['_'.$header])) { + $fvalue = get_input_value('_'.$header, RCUBE_INPUT_POST, TRUE); + } + else if (!empty($COMPOSE['param'][$header])) { + $fvalue = $COMPOSE['param'][$header]; + } + else if ($compose_mode == RCUBE_COMPOSE_REPLY) { + // get recipent address(es) out of the message headers + if ($header == 'to') { + $mailfollowup = $MESSAGE->headers->others['mail-followup-to']; + $mailreplyto = $MESSAGE->headers->others['mail-reply-to']; + + // Reply to mailing list... + if ($MESSAGE->reply_all == 'list' && $mailfollowup) + $fvalue = $mailfollowup; + else if ($MESSAGE->reply_all == 'list' + && preg_match('/]+)>/i', $MESSAGE->headers->others['list-post'], $m)) + $fvalue = $m[1]; + // Reply to... + else if ($MESSAGE->reply_all && $mailfollowup) + $fvalue = $mailfollowup; + else if ($mailreplyto) + $fvalue = $mailreplyto; + else if (!empty($MESSAGE->headers->replyto)) + $fvalue = $MESSAGE->headers->replyto; + else if (!empty($MESSAGE->headers->from)) + $fvalue = $MESSAGE->headers->from; + + // Reply to message sent by yourself (#1487074) + if (!empty($ident) && $fvalue == $ident['ident']) { + $fvalue = $MESSAGE->headers->to; + } + } + // add recipient of original message if reply to all + else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') { + if ($v = $MESSAGE->headers->to) + $fvalue .= $v; + if ($v = $MESSAGE->headers->cc) + $fvalue .= (!empty($fvalue) ? $separator : '') . $v; + } + } + else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) { + // get drafted headers + if ($header=='to' && !empty($MESSAGE->headers->to)) + $fvalue = $MESSAGE->get_header('to'); + else if ($header=='cc' && !empty($MESSAGE->headers->cc)) + $fvalue = $MESSAGE->get_header('cc'); + else if ($header=='bcc' && !empty($MESSAGE->headers->bcc)) + $fvalue = $MESSAGE->get_header('bcc'); + else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to'])) + $fvalue = $MESSAGE->get_header('mail-reply-to'); + else if ($header=='replyto' && !empty($MESSAGE->headers->replyto)) + $fvalue = $MESSAGE->get_header('reply-to'); + else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to'])) + $fvalue = $MESSAGE->get_header('mail-followup-to'); + } + + // split recipients and put them back together in a unique way + if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) { + $to_addresses = $IMAP->decode_address_list($fvalue, null, $decode_header); + $fvalue = array(); + + foreach ($to_addresses as $addr_part) { + if (empty($addr_part['mailto'])) + continue; + + $mailto = mb_strtolower(rcube_idn_to_utf8($addr_part['mailto'])); + + if (!in_array($mailto, $a_recipients) + && ($header == 'to' || empty($MESSAGE->compose['from_email']) || $mailto != $MESSAGE->compose['from_email']) + ) { + if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name']) + $string = format_email_recipient($mailto, $addr_part['name']); + else + $string = $mailto; + + $fvalue[] = $string; + $a_recipients[] = $addr_part['mailto']; + } + } + + $fvalue = implode($separator, $fvalue); + } + $MESSAGE->compose[$header] = $fvalue; +} +unset($a_recipients); + +// process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data +$MESSAGE_BODY = rcmail_prepare_message_body(); + + +/****** compose mode functions ********/ function rcmail_compose_headers($attrib) { - global $IMAP, $MESSAGE, $DB, $compose_mode; - static $sa_recipients = array(); + global $MESSAGE; list($form_start, $form_end) = get_form_tags($attrib); - - $out = ''; + + $out = ''; $part = strtolower($attrib['part']); - + switch ($part) { case 'from': - return rcmail_compose_header_from($attrib); + return $form_start . rcmail_compose_header_from($attrib); case 'to': - $fname = '_to'; - $header = 'to'; - - // we have a set of recipients stored is session - if (($mailto_id = get_input_value('_mailto', RCUBE_INPUT_GET)) && $_SESSION['mailto'][$mailto_id]) - $fvalue = $_SESSION['mailto'][$mailto_id]; - else if (!empty($_GET['_to'])) - $fvalue = get_input_value('_to', RCUBE_INPUT_GET); - case 'cc': - if (!$fname) - { - $fname = '_cc'; - $header = 'cc'; - } case 'bcc': - if (!$fname) - { - $fname = '_bcc'; - $header = 'bcc'; - } - + $fname = '_' . $part; + $header = $param = $part; + $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex'); - $field_type = 'textarea'; + $field_type = 'html_textarea'; break; case 'replyto': case 'reply-to': $fname = '_replyto'; - $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex'); - $field_type = 'textfield'; - break; - } - - if ($fname && !empty($_POST[$fname])) - $fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE); - - else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY) - { - // get recipent address(es) out of the message headers - if ($header=='to' && !empty($MESSAGE['headers']->replyto)) - $fvalue = $MESSAGE['headers']->replyto; - - else if ($header=='to' && !empty($MESSAGE['headers']->from)) - $fvalue = $MESSAGE['headers']->from; - - // add recipent of original message if reply to all - else if ($header=='cc' && !empty($MESSAGE['reply_all'])) - { - if ($v = $MESSAGE['headers']->to) - $fvalue .= $v; - - if ($v = $MESSAGE['headers']->cc) - $fvalue .= (!empty($fvalue) ? ', ' : '') . $v; - } - - // split recipients and put them back together in a unique way - if (!empty($fvalue)) - { - $to_addresses = $IMAP->decode_address_list($fvalue); - $fvalue = ''; - foreach ($to_addresses as $addr_part) - { - if (!empty($addr_part['mailto']) && !in_array($addr_part['mailto'], $sa_recipients) && (!$MESSAGE['FROM'] || !in_array($addr_part['mailto'], $MESSAGE['FROM']))) - { - $fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string']; - $sa_recipients[] = $addr_part['mailto']; - } + $param = 'replyto'; + $header = 'reply-to'; + + case 'followupto': + case 'followup-to': + if (!$fname) { + $fname = '_followupto'; + $param = 'followupto'; + $header = 'mail-followup-to'; } - } - } - else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT) - { - // get drafted headers - if ($header=='to' && !empty($MESSAGE['headers']->to)) - $fvalue = $IMAP->decode_header($MESSAGE['headers']->to); - if ($header=='cc' && !empty($MESSAGE['headers']->cc)) - $fvalue = $IMAP->decode_header($MESSAGE['headers']->cc); - - if ($header=='bcc' && !empty($MESSAGE['headers']->bcc)) - $fvalue = $IMAP->decode_header($MESSAGE['headers']->bcc); + $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex'); + $field_type = 'html_inputfield'; + break; } - if ($fname && $field_type) { // pass the following attributes to the form class - $field_attrib = array('name' => $fname); + $field_attrib = array('name' => $fname, 'spellcheck' => 'false'); foreach ($attrib as $attr => $value) if (in_array($attr, $allow_attrib)) $field_attrib[$attr] = $value; // create teaxtarea object $input = new $field_type($field_attrib); - $out = $input->show($fvalue); + $out = $input->show($MESSAGE->compose[$param]); } - + if ($form_start) $out = $form_start.$out; - return $out; -} + // configure autocompletion + rcube_autocomplete_init(); + return $out; +} function rcmail_compose_header_from($attrib) { - global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode; - + global $MESSAGE, $OUTPUT; + // pass the following attributes to the form class $field_attrib = array('name' => '_from'); foreach ($attrib as $attr => $value) if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex'))) $field_attrib[$attr] = $value; - // extract all recipients of the reply-message - $a_recipients = array(); - if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE['headers'])) - { - $MESSAGE['FROM'] = array(); - - $a_to = $IMAP->decode_address_list($MESSAGE['headers']->to); - foreach ($a_to as $addr) - { - if (!empty($addr['mailto'])) - $a_recipients[] = $addr['mailto']; - } - - if (!empty($MESSAGE['headers']->cc)) - { - $a_cc = $IMAP->decode_address_list($MESSAGE['headers']->cc); - foreach ($a_cc as $addr) - { - if (!empty($addr['mailto'])) - $a_recipients[] = $addr['mailto']; - } - } - } - - // get this user's identities - $sql_result = $USER->list_identities(); - - if ($DB->num_rows($sql_result)) + if (count($MESSAGE->identities)) { - $from_id = 0; $a_signatures = array(); $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)"; - $select_from = new select($field_attrib); + $select_from = new html_select($field_attrib); - while ($sql_arr = $DB->fetch_assoc($sql_result)) + // create SELECT element + foreach ($MESSAGE->identities as $sql_arr) { $identity_id = $sql_arr['identity_id']; $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id); // add signature to array - if (!empty($sql_arr['signature'])) + if (!empty($sql_arr['signature']) && empty($COMPOSE['param']['nosig'])) { $a_signatures[$identity_id]['text'] = $sql_arr['signature']; $a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false; if ($a_signatures[$identity_id]['is_html']) { $h2t = new html2text($a_signatures[$identity_id]['text'], false, false); - $plainTextPart = $h2t->get_text(); - $a_signatures[$identity_id]['plain_text'] = trim($plainTextPart); + $a_signatures[$identity_id]['plain_text'] = trim($h2t->get_text()); } } - - // 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 ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE['FROM'])) - $MESSAGE['FROM'][] = $sql_arr['email']; - - if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE['headers']->from, $sql_arr['email'])) - $from_id = $sql_arr['identity_id']; } - // overwrite identity selection with post parameter - if (isset($_POST['_from'])) - $from_id = get_input_value('_from', RCUBE_INPUT_POST); - - $out = $select_from->show($from_id); + $out = $select_from->show($MESSAGE->compose['from']); // add signatures to client $OUTPUT->set_env('signatures', $a_signatures); } - else - { - $input_from = new textfield($field_attrib); - $out = $input_from->show($_POST['_from']); + // no identities, display text input field + else { + $field_attrib['class'] = 'from_address'; + $input_from = new html_inputfield($field_attrib); + $out = $input_from->show($MESSAGE->compose['from']); } - - if ($form_start) - $out = $form_start.$out; return $out; } -function rcmail_compose_body($attrib) +function rcmail_compose_editor_mode() { - global $CONFIG, $OUTPUT, $MESSAGE, $compose_mode; - - list($form_start, $form_end) = get_form_tags($attrib); - unset($attrib['form']); - - if (empty($attrib['id'])) - $attrib['id'] = 'rcmComposeMessage'; + global $RCMAIL, $MESSAGE, $compose_mode; + static $useHtml; - $attrib['name'] = '_message'; + if ($useHtml !== null) + return $useHtml; - if ($CONFIG['htmleditor']) - $isHtml = true; - else - $isHtml = false; + $html_editor = intval($RCMAIL->config->get('htmleditor')); + + if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) { + $useHtml = $MESSAGE->has_html_part(); + } + else if ($compose_mode == RCUBE_COMPOSE_REPLY) { + $useHtml = ($html_editor == 1 || ($html_editor == 2 && $MESSAGE->has_html_part())); + } + else { // RCUBE_COMPOSE_FORWARD or NEW + $useHtml = ($html_editor == 1); + } - $body = ''; + return $useHtml; +} + + +function rcmail_prepare_message_body() +{ + global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $LINE_LENGTH, $HTML_MODE; // use posted message body - if (!empty($_POST['_message'])) - { - $body = get_input_value('_message', RCUBE_INPUT_POST, TRUE); - } - // compose reply-body - else if ($compose_mode == RCUBE_COMPOSE_REPLY) - { - $hasHtml = rcmail_has_html_part($MESSAGE['parts']); - if ($hasHtml && $CONFIG['htmleditor']) - { - $body = rcmail_first_html_part($MESSAGE); - $isHtml = true; + if (!empty($_POST['_message'])) { + $body = get_input_value('_message', RCUBE_INPUT_POST, true); + $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST); + } + else if ($COMPOSE['param']['body']) { + $body = $COMPOSE['param']['body']; + $isHtml = false; + } + // forward as attachment + else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) { + $isHtml = rcmail_compose_editor_mode(); + $body = ''; + if (empty($COMPOSE['attachments'])) + rcmail_write_forward_attachment($MESSAGE); + } + // reply/edit/draft/forward + else if ($compose_mode) { + $has_html_part = $MESSAGE->has_html_part(); + $isHtml = rcmail_compose_editor_mode(); + + if ($isHtml) { + if ($has_html_part) { + $body = $MESSAGE->first_html_part(); } - else - { - $body = rcmail_first_text_part($MESSAGE); - $isHtml = false; + else { + $body = $MESSAGE->first_text_part(); + // try to remove the signature + if ($RCMAIL->config->get('strip_existing_sig', true)) + $body = rcmail_remove_signature($body); + // add HTML formatting + $body = rcmail_plain_body($body); + if ($body) + $body = '
' . $body . '
'; } - - $body = rcmail_create_reply_body($body, $isHtml); } - // forward message body inline - else if ($compose_mode == RCUBE_COMPOSE_FORWARD) - { - $hasHtml = rcmail_has_html_part($MESSAGE['parts']); - if ($hasHtml && $CONFIG['htmleditor']) - { - $body = rcmail_first_html_part($MESSAGE); - $isHtml = true; + else { + if ($has_html_part) { + // use html part if it has been used for message (pre)viewing + // decrease line length for quoting + $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH; + $txt = new html2text($MESSAGE->first_html_part(), false, true, $len); + $body = $txt->get_text(); } - else - { - $body = rcmail_first_text_part($MESSAGE); - $isHtml = false; + else { + $body = $MESSAGE->first_text_part($part); + if ($body && $part && $part->ctype_secondary == 'plain' + && $part->ctype_parameters['format'] == 'flowed' + ) { + $body = rcube_message::unfold_flowed($body); + } } - - $body = rcmail_create_forward_body($body, $isHtml); } - else if ($compose_mode == RCUBE_COMPOSE_DRAFT) - { - $hasHtml = rcmail_has_html_part($MESSAGE['parts']); - if ($hasHtml && $CONFIG['htmleditor']) - { - $body = rcmail_first_html_part($MESSAGE); - $isHtml = true; - } - else - { - $body = rcmail_first_text_part($MESSAGE); - $isHtml = false; - } - $body = rcmail_create_draft_body($body, $isHtml); + // compose reply-body + if ($compose_mode == RCUBE_COMPOSE_REPLY) + $body = rcmail_create_reply_body($body, $isHtml); + // forward message body inline + else if ($compose_mode == RCUBE_COMPOSE_FORWARD) + $body = rcmail_create_forward_body($body, $isHtml); + // load draft message body + else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) + $body = rcmail_create_draft_body($body, $isHtml); + } + else { // new message + $isHtml = rcmail_compose_editor_mode(); + } + + $plugin = $RCMAIL->plugins->exec_hook('message_compose_body', + array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode)); + $body = $plugin['body']; + unset($plugin); + + // add blocked.gif attachment (#1486516) + if ($isHtml && preg_match('#comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'].'&_id='.$COMPOSE['id'], + $body); } + } + + $HTML_MODE = $isHtml; + + return $body; +} + +function rcmail_compose_body($attrib) +{ + global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY; - $OUTPUT->include_script('tiny_mce/tiny_mce.js'); - $OUTPUT->include_script("editor.js"); - $OUTPUT->add_script('rcmail_editor_init("$__skin_path");'); + list($form_start, $form_end) = get_form_tags($attrib); + unset($attrib['form']); + + if (empty($attrib['id'])) + $attrib['id'] = 'rcmComposeBody'; + + $attrib['name'] = '_message'; + + $isHtml = $HTML_MODE; $out = $form_start ? "$form_start\n" : ''; - $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE['headers']->messageID) : '')); + $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : '')); $out .= $saveid->show(); - $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes')); + $drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes')); $out .= $drafttoggle->show(); - $msgtype = new hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0"))); + $msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0"))); $out .= $msgtype->show(); - // If desired, set this text area to be editable by TinyMCE - if ($isHtml) - $attrib['mce_editable'] = "true"; - $textarea = new textarea($attrib); - $out .= $textarea->show($body); + // If desired, set this textarea to be editable by TinyMCE + if ($isHtml) { + $attrib['class'] = 'mce_editor'; + $textarea = new html_textarea($attrib); + $out .= $textarea->show($MESSAGE_BODY); + } + else { + $textarea = new html_textarea($attrib); + $out .= $textarea->show(''); + // quote plain text, inject into textarea + $table = get_html_translation_table(HTML_SPECIALCHARS); + $MESSAGE_BODY = strtr($MESSAGE_BODY, $table); + $out = substr($out, 0, -11) . $MESSAGE_BODY . ''; + } + $out .= $form_end ? "\n$form_end" : ''; + $OUTPUT->set_env('composebody', $attrib['id']); + + // include HTML editor + rcube_html_editor(); + // include GoogieSpell - if (!empty($CONFIG['enable_spellcheck']) && !$isHtml) - { - $lang_set = ''; - if (!empty($CONFIG['spellcheck_languages']) && is_array($CONFIG['spellcheck_languages'])) - $lang_set = "googie.setLanguages(".array2js($CONFIG['spellcheck_languages']).");\n"; - + if (!empty($CONFIG['enable_spellcheck'])) { + $engine = $RCMAIL->config->get('spellcheck_engine','googie'); + $dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary'); + $spellcheck_langs = (array) $RCMAIL->config->get('spellcheck_languages', + array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español', + 'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski', + 'pt'=>'Português', 'fi'=>'Suomi', 'sv'=>'Svenska')); + + // googie works only with two-letter codes + if ($engine == 'googie') { + $lang = strtolower(substr($_SESSION['language'], 0, 2)); + + $spellcheck_langs_googie = array(); + foreach ($spellcheck_langs as $key => $name) + $spellcheck_langs_googie[strtolower(substr($key,0,2))] = $name; + $spellcheck_langs = $spellcheck_langs_googie; + } + else { + $lang = $_SESSION['language']; + + // if not found in the list, try with two-letter code + if (!$spellcheck_langs[$lang]) + $lang = strtolower(substr($lang, 0, 2)); + } + + if (!$spellcheck_langs[$lang]) + $lang = 'en'; + + $editor_lang_set = array(); + foreach ($spellcheck_langs as $key => $name) { + $editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key); + } + $OUTPUT->include_script('googiespell.js'); $OUTPUT->add_script(sprintf( - "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n". + "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','?_task=utils&_action=spell&lang=', %s);\n". "googie.lang_chck_spell = \"%s\";\n". "googie.lang_rsm_edt = \"%s\";\n". "googie.lang_close = \"%s\";\n". "googie.lang_revert = \"%s\";\n". - "googie.lang_no_error_found = \"%s\";\n%s". + "googie.lang_no_error_found = \"%s\";\n". + "googie.lang_learn_word = \"%s\";\n". + "googie.setLanguages(%s);\n". "googie.setCurrentLanguage('%s');\n". + "googie.setSpellContainer('spellcheck-control');\n". "googie.decorateTextarea('%s');\n". "%s.set_env('spellcheck', googie);", - $GLOBALS['COMM_PATH'], + !empty($dictionary) ? 'true' : 'false', JQ(Q(rcube_label('checkspelling'))), JQ(Q(rcube_label('resumeediting'))), JQ(Q(rcube_label('close'))), JQ(Q(rcube_label('revertto'))), JQ(Q(rcube_label('nospellerrors'))), - $lang_set, - substr($_SESSION['user_lang'], 0, 2), + JQ(Q(rcube_label('addtodict'))), + json_serialize($spellcheck_langs), + $lang, $attrib['id'], JS_OBJECT_NAME), 'foot'); - rcube_add_label('checking'); - } - - $out .= "\n".''; + $OUTPUT->add_label('checking'); + $OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set)); + } + + $out .= "\n".''; return $out; } @@ -471,49 +805,53 @@ function rcmail_compose_body($attrib) function rcmail_create_reply_body($body, $bodyIsHtml) { - global $IMAP, $MESSAGE; + global $RCMAIL, $MESSAGE, $LINE_LENGTH; - if (! $bodyIsHtml) - { - // soft-wrap message first - $body = wordwrap($body, 75); - - // split body into single lines - $a_lines = preg_split('/\r?\n/', $body); - - // add > to each line - for($n=0; $n')===0) - $a_lines[$n] = '>'.$a_lines[$n]; - else - $a_lines[$n] = '> '.$a_lines[$n]; - } - - $body = join("\n", $a_lines); + // build reply prefix + $from = array_pop($RCMAIL->imap->decode_address_list($MESSAGE->get_header('from'), 1, false)); + $prefix = rcube_label(array( + 'name' => 'mailreplyintro', + 'vars' => array( + 'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')), + 'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']), + ) + )); - // add title line - $prefix = sprintf("\n\n\nOn %s, %s wrote:\n", - $MESSAGE['headers']->date, - $IMAP->decode_header($MESSAGE['headers']->from)); + if (!$bodyIsHtml) { + $body = preg_replace('/\r?\n/', "\n", $body); // try to remove the signature - if ($sp = strrstr($body, '-- ')) - { - if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r") - $body = substr($body, 0, $sp-1); - } + if ($RCMAIL->config->get('strip_existing_sig', true)) + $body = rcmail_remove_signature($body); + + // soft-wrap and quote message text + $body = rcmail_wrap_and_quote(rtrim($body, "\n"), $LINE_LENGTH); + + $prefix .= "\n"; $suffix = ''; - } - else - { - $prefix = sprintf("

On %s, %s wrote:
", - $MESSAGE['headers']->date, - $IMAP->decode_header($MESSAGE['headers']->from)); - $suffix = "
"; + if ($RCMAIL->config->get('top_posting')) + $prefix = "\n\n\n" . $prefix; + } + else { + // save inline images to files + $cid_map = rcmail_write_inline_attachments($MESSAGE); + // set is_safe flag (we need this for html body washing) + rcmail_check_safe($MESSAGE); + // clean up html tags + $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); + + // build reply (quote content) + $prefix = '

' . Q($prefix) . "

\n"; + $prefix .= '
'; + + if ($RCMAIL->config->get('top_posting')) { + $prefix = '
' . $prefix; + $suffix = '
'; + } + else { + $suffix = '

'; + } } return $prefix.$body.$suffix; @@ -522,207 +860,427 @@ function rcmail_create_reply_body($body, $bodyIsHtml) function rcmail_create_forward_body($body, $bodyIsHtml) { - global $IMAP, $MESSAGE; + global $RCMAIL, $MESSAGE, $COMPOSE; - if (! $bodyIsHtml) + // add attachments + if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts)) + $cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml); + + $date = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')); + $charset = $RCMAIL->output->get_charset(); + + if (!$bodyIsHtml) { - // soft-wrap message first - $body = wordwrap($body, 80); - - $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n", - $MESSAGE['subject'], - $MESSAGE['headers']->date, - $IMAP->decode_header($MESSAGE['headers']->from), - $IMAP->decode_header($MESSAGE['headers']->to)); + $prefix = "\n\n\n-------- " . rcube_label('originalmessage') . " --------\n"; + $prefix .= rcube_label('subject') . ': ' . $MESSAGE->subject . "\n"; + $prefix .= rcube_label('date') . ': ' . $date . "\n"; + $prefix .= rcube_label('from') . ': ' . $MESSAGE->get_header('from') . "\n"; + $prefix .= rcube_label('to') . ': ' . $MESSAGE->get_header('to') . "\n"; + + if ($MESSAGE->headers->cc) + $prefix .= rcube_label('cc') . ': ' . $MESSAGE->get_header('cc') . "\n"; + if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from) + $prefix .= rcube_label('replyto') . ': ' . $MESSAGE->get_header('replyto') . "\n"; + + $prefix .= "\n"; } else { + // set is_safe flag (we need this for html body washing) + rcmail_check_safe($MESSAGE); + // clean up html tags + $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); + $prefix = sprintf( - "

-------- Original Message --------" . + "

-------- " . rcube_label('originalmessage') . " --------

" . "" . - "" . - "" . - "" . - "" . - "
Subject: %s
Date: %s
From: %s
To: %s

", - Q($MESSAGE['subject']), - Q($MESSAGE['headers']->date), - Q($IMAP->decode_header($MESSAGE['headers']->from)), - Q($IMAP->decode_header($MESSAGE['headers']->to))); + "%s: %s" . + "%s: %s" . + "%s: %s" . + "%s: %s", + rcube_label('subject'), Q($MESSAGE->subject), + rcube_label('date'), Q($date), + rcube_label('from'), htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $charset), + rcube_label('to'), htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $charset)); + + if ($MESSAGE->headers->cc) + $prefix .= sprintf("%s: %s", + rcube_label('cc'), + htmlspecialchars(Q($MESSAGE->get_header('cc'), 'replace'), ENT_COMPAT, $charset)); + + if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from) + $prefix .= sprintf("%s: %s", + rcube_label('replyto'), + htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $charset)); + + $prefix .= "
"; } - // add attachments - if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE['parts'])) - rcmail_write_compose_attachments($MESSAGE); - return $prefix.$body; } function rcmail_create_draft_body($body, $bodyIsHtml) { - global $IMAP, $MESSAGE; - + global $MESSAGE, $OUTPUT, $COMPOSE; + /** * add attachments - * sizeof($MESSAGE['parts'] can be 1 - e.g. attachment, but no text! + * sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text! */ - if (!isset($_SESSION['compose']['forward_attachments']) - && is_array($MESSAGE['parts']) - && count($MESSAGE['parts']) > 0) - rcmail_write_compose_attachments($MESSAGE); + if (empty($COMPOSE['forward_attachments']) + && is_array($MESSAGE->mime_parts) + && count($MESSAGE->mime_parts) > 0) + { + $cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml); + + // replace cid with href in inline images links + if ($cid_map) + $body = str_replace(array_keys($cid_map), array_values($cid_map), $body); + } return $body; } - - -function rcmail_write_compose_attachments(&$message) + + +function rcmail_remove_signature($body) { - global $IMAP, $CONFIG; + global $RCMAIL; - $temp_dir = unslashify($CONFIG['temp_dir']); + $len = strlen($body); + $sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15); - if (!is_array($_SESSION['compose']['attachments'])) - $_SESSION['compose']['attachments'] = array(); - - foreach ($message['parts'] as $pid => $part) + while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) { + if ($sp == 0 || $body[$sp-1] == "\n") { + // do not touch blocks with more that X lines + if (substr_count($body, "\n", $sp) < $sig_max_lines) { + $body = substr($body, 0, max(0, $sp-1)); + } + break; + } + } + + return $body; +} + + +function rcmail_write_compose_attachments(&$message, $bodyIsHtml) +{ + global $RCMAIL, $COMPOSE; + + $cid_map = $messages = array(); + foreach ((array)$message->mime_parts as $pid => $part) { - if ($part->ctype_primary != 'message' && - ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] || - (empty($part->disposition) && $part->filename))) - { - $tmp_path = tempnam($temp_dir, 'rcmAttmnt'); - if ($fp = fopen($tmp_path, 'w')) - { - fwrite($fp, $IMAP->get_message_part($message['UID'], $pid, $part->encoding)); - fclose($fp); - - $_SESSION['compose']['attachments'][] = array( - 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary, - 'name' => $part->filename, - 'path' => $tmp_path - ); + if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->ctype_primary != 'multipart' && + ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) + && $part->mimetype != 'application/ms-tnef' + ) { + $skip = false; + if ($part->mimetype == 'message/rfc822') { + $messages[] = $part->mime_id; + } else if ($messages) { + // skip attachments included in message/rfc822 attachment (#1486487) + foreach ($messages as $mimeid) + if (strpos($part->mime_id, $mimeid.'.') === 0) { + $skip = true; + break; + } + } + + if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) { + $COMPOSE['attachments'][$attachment['id']] = $attachment; + if ($bodyIsHtml && ($part->content_id || $part->content_location)) { + $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'].'&_id='.$COMPOSE['id']; + if ($part->content_id) + $cid_map['cid:'.$part->content_id] = $url; + else + $cid_map[$part->content_location] = $url; + } + } + } + } + + $COMPOSE['forward_attachments'] = true; + + return $cid_map; +} + + +function rcmail_write_inline_attachments(&$message) +{ + global $RCMAIL, $COMPOSE; + + $cid_map = array(); + foreach ((array)$message->mime_parts as $pid => $part) { + if (($part->content_id || $part->content_location) && $part->filename) { + if ($attachment = rcmail_save_attachment($message, $pid)) { + $COMPOSE['attachments'][$attachment['id']] = $attachment; + $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'].'&_id='.$COMPOSE['id']; + if ($part->content_id) + $cid_map['cid:'.$part->content_id] = $url; + else + $cid_map[$part->content_location] = $url; } } } - - $_SESSION['compose']['forward_attachments'] = TRUE; + + return $cid_map; +} + +// Creates an attachment from the forwarded message +function rcmail_write_forward_attachment(&$message) +{ + global $RCMAIL, $COMPOSE; + + if (strlen($message->subject)) { + $name = mb_substr($message->subject, 0, 64) . '.eml'; + } + else { + $name = 'message_rfc822.eml'; + } + + $mem_limit = parse_bytes(ini_get('memory_limit')); + $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB + $data = $path = null; + + // don't load too big attachments into memory + if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) { + $temp_dir = unslashify($RCMAIL->config->get('temp_dir')); + $path = tempnam($temp_dir, 'rcmAttmnt'); + if ($fp = fopen($path, 'w')) { + $RCMAIL->imap->get_raw_body($message->uid, $fp); + fclose($fp); + } else + return false; + } else { + $data = $RCMAIL->imap->get_raw_body($message->uid); + } + + $attachment = array( + 'group' => $COMPOSE['id'], + 'name' => $name, + 'mimetype' => 'message/rfc822', + 'data' => $data, + 'path' => $path, + 'size' => $path ? filesize($path) : strlen($data), + ); + + $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment); + + if ($attachment['status']) { + unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']); + $COMPOSE['attachments'][$attachment['id']] = $attachment; + return true; + } else if ($path) { + @unlink($path); + } + + return false; } +function rcmail_save_attachment(&$message, $pid) +{ + global $COMPOSE; + + $rcmail = rcmail::get_instance(); + $part = $message->mime_parts[$pid]; + $mem_limit = parse_bytes(ini_get('memory_limit')); + $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB + $data = $path = null; + + // don't load too big attachments into memory + if ($mem_limit > 0 && $part->size > $mem_limit - $curr_mem) { + $temp_dir = unslashify($rcmail->config->get('temp_dir')); + $path = tempnam($temp_dir, 'rcmAttmnt'); + if ($fp = fopen($path, 'w')) { + $message->get_part_content($pid, $fp); + fclose($fp); + } else + return false; + } else { + $data = $message->get_part_content($pid); + } + + $attachment = array( + 'group' => $COMPOSE['id'], + 'name' => $part->filename ? $part->filename : 'Part_'.$pid.'.'.$part->ctype_secondary, + 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary, + 'content_id' => $part->content_id, + 'data' => $data, + 'path' => $path, + 'size' => $path ? filesize($path) : strlen($data), + ); + + $attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment); + + if ($attachment['status']) { + unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']); + return $attachment; + } else if ($path) { + @unlink($path); + } + + return false; +} + +function rcmail_save_image($path, $mimetype='') +{ + global $COMPOSE; + + // handle attachments in memory + $data = file_get_contents($path); + + $attachment = array( + 'group' => $COMPOSE['id'], + 'name' => rcmail_basename($path), + 'mimetype' => $mimetype ? $mimetype : rc_mime_content_type($path, $name), + 'data' => $data, + 'size' => strlen($data), + ); + + $attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment); + + if ($attachment['status']) { + unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']); + return $attachment; + } + + return false; +} + +function rcmail_basename($filename) +{ + // basename() is not unicode safe and locale dependent + if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) { + return preg_replace('/^.*[\\\\\\/]/', '', $filename); + } else { + return preg_replace('/^.*[\/]/', '', $filename); + } +} + function rcmail_compose_subject($attrib) { - global $CONFIG, $MESSAGE, $compose_mode; - + global $MESSAGE, $COMPOSE, $compose_mode; + list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); - + $attrib['name'] = '_subject'; - $textfield = new textfield($attrib); + $attrib['spellcheck'] = 'true'; + $textfield = new html_inputfield($attrib); $subject = ''; // use subject from post - if (isset($_POST['_subject'])) + if (isset($_POST['_subject'])) { $subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE); - + } // create a reply-subject - else if ($compose_mode == RCUBE_COMPOSE_REPLY) - { - if (eregi('^re:', $MESSAGE['subject'])) - $subject = $MESSAGE['subject']; + else if ($compose_mode == RCUBE_COMPOSE_REPLY) { + if (preg_match('/^re:/i', $MESSAGE->subject)) + $subject = $MESSAGE->subject; else - $subject = 'Re: '.$MESSAGE['subject']; + $subject = 'Re: '.$MESSAGE->subject; } - // create a forward-subject - else if ($compose_mode == RCUBE_COMPOSE_FORWARD) - { - if (eregi('^fwd:', $MESSAGE['subject'])) - $subject = $MESSAGE['subject']; + else if ($compose_mode == RCUBE_COMPOSE_FORWARD) { + if (preg_match('/^fwd:/i', $MESSAGE->subject)) + $subject = $MESSAGE->subject; else - $subject = 'Fwd: '.$MESSAGE['subject']; + $subject = 'Fwd: '.$MESSAGE->subject; } - // creeate a draft-subject - else if ($compose_mode == RCUBE_COMPOSE_DRAFT) - $subject = $MESSAGE['subject']; - + else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) { + $subject = $MESSAGE->subject; + } + else if (!empty($COMPOSE['param']['subject'])) { + $subject = $COMPOSE['param']['subject']; + } + $out = $form_start ? "$form_start\n" : ''; $out .= $textfield->show($subject); $out .= $form_end ? "\n$form_end" : ''; - + return $out; } function rcmail_compose_attachment_list($attrib) { - global $OUTPUT, $CONFIG; - + global $OUTPUT, $CONFIG, $COMPOSE; + // add ID if not given if (!$attrib['id']) $attrib['id'] = 'rcmAttachmentList'; - - // allow the following attributes to be added to the
    tag - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style')); - - $out = '\n"; - - if (is_array($_SESSION['compose']['attachments'])) - { - if ($attrib['deleteicon']) - $button = sprintf('%s', - $CONFIG['skin_path'], - $attrib['deleteicon'], - rcube_label('delete')); + + $out = "\n"; + $jslist = array(); + + if (is_array($COMPOSE['attachments'])) { + if ($attrib['deleteicon']) { + $button = html::img(array( + 'src' => $CONFIG['skin_path'] . $attrib['deleteicon'], + 'alt' => rcube_label('delete') + )); + } else - $button = rcube_label('delete'); + $button = Q(rcube_label('delete')); - foreach ($_SESSION['compose']['attachments'] as $id => $a_prop) - $out .= sprintf('
  • %s%s
    • ', - $id, - JS_OBJECT_NAME, - $id, - Q(rcube_label('delete')), - $button, - Q($a_prop['name'])); + foreach ($COMPOSE['attachments'] as $id => $a_prop) + { + if (empty($a_prop)) + continue; + + $out .= html::tag('li', array('id' => 'rcmfile'.$id), + html::a(array( + 'href' => "#delete", + 'title' => rcube_label('delete'), + 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id)), + $button) . Q($a_prop['name'])); + + $jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']); + } } + if ($attrib['deleteicon']) + $COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon']; + if ($attrib['cancelicon']) + $OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']); + if ($attrib['loadingicon']) + $OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']); + + $OUTPUT->set_env('attachments', $jslist); $OUTPUT->add_gui_object('attachmentlist', $attrib['id']); - $out .= '
'; - return $out; + return html::tag('ul', $attrib, $out, html::$common_attrib); } function rcmail_compose_attachment_form($attrib) { - global $OUTPUT, $SESS_HIDDEN_FIELD; + global $RCMAIL, $OUTPUT; // add ID if not given if (!$attrib['id']) $attrib['id'] = 'rcmUploadbox'; - - // allow the following attributes to be added to the
tag - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style')); - $input_field = rcmail_compose_attachment_field(array()); - $label_send = rcube_label('upload'); - $label_close = rcube_label('close'); - $js_instance = JS_OBJECT_NAME; - - $out = << -
-$SESS_HIDDEN_FIELD -$input_field
- - -
-
-EOF; - + // Get filesize, enable upload progress bar + $max_filesize = rcube_upload_init(); + + $button = new html_inputfield(array('type' => 'button')); + + $out = html::div($attrib, + $OUTPUT->form_tag(array('name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'), + html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) . + html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) . + html::div('buttons', + $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' . + $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")) + ) + ) + ); + $OUTPUT->add_gui_object('uploadbox', $attrib['id']); return $out; } @@ -730,11 +1288,12 @@ EOF; function rcmail_compose_attachment_field($attrib) { - // allow the following attributes to be added to the tag - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'size')); - - $out = '"; - return $out; + $attrib['type'] = 'file'; + $attrib['name'] = '_attachments[]'; + $attrib['multiple'] = 'multiple'; + + $field = new html_inputfield($attrib); + return $field->show(); } @@ -744,9 +1303,9 @@ function rcmail_priority_selector($attrib) list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); - + $attrib['name'] = '_priority'; - $selector = new select($attrib); + $selector = new html_select($attrib); $selector->add(array(rcube_label('lowest'), rcube_label('low'), @@ -754,33 +1313,65 @@ function rcmail_priority_selector($attrib) rcube_label('high'), rcube_label('highest')), array(5, 4, 0, 2, 1)); - - $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE['headers']->priority); + + if (isset($_POST['_priority'])) + $sel = $_POST['_priority']; + else if (intval($MESSAGE->headers->priority) != 3) + $sel = intval($MESSAGE->headers->priority); + else + $sel = 0; $out = $form_start ? "$form_start\n" : ''; $out .= $selector->show($sel); $out .= $form_end ? "\n$form_end" : ''; - + return $out; } function rcmail_receipt_checkbox($attrib) { - global $MESSAGE; - + global $RCMAIL, $MESSAGE, $compose_mode; + list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); - + if (!isset($attrib['id'])) $attrib['id'] = 'receipt'; $attrib['name'] = '_receipt'; $attrib['value'] = '1'; - $checkbox = new checkbox($attrib); + $checkbox = new html_checkbox($attrib); + + if ($MESSAGE && in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) + $mdn_default = (bool) $MESSAGE->headers->mdn_to; + else + $mdn_default = $RCMAIL->config->get('mdn_default'); $out = $form_start ? "$form_start\n" : ''; - $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0); + $out .= $checkbox->show($mdn_default); + $out .= $form_end ? "\n$form_end" : ''; + + return $out; +} + + +function rcmail_dsn_checkbox($attrib) +{ + global $RCMAIL; + + list($form_start, $form_end) = get_form_tags($attrib); + unset($attrib['form']); + + if (!isset($attrib['id'])) + $attrib['id'] = 'dsn'; + + $attrib['name'] = '_dsn'; + $attrib['value'] = '1'; + $checkbox = new html_checkbox($attrib); + + $out = $form_start ? "$form_start\n" : ''; + $out .= $checkbox->show($RCMAIL->config->get('dsn_default')); $out .= $form_end ? "\n$form_end" : ''; return $out; @@ -791,74 +1382,92 @@ function rcmail_editor_selector($attrib) { global $CONFIG, $MESSAGE, $compose_mode; - $choices = array( - 'html' => 'htmltoggle', - 'plain' => 'plaintoggle' - ); + // determine whether HTML or plain text should be checked + $useHtml = rcmail_compose_editor_mode(); - // determine whether HTML or plain text should be checked - if ($CONFIG['htmleditor']) - $useHtml = true; - else - $useHtml = false; + if (empty($attrib['editorid'])) + $attrib['editorid'] = 'rcmComposeBody'; - if ($compose_mode == RCUBE_COMPOSE_REPLY || - $compose_mode == RCUBE_COMPOSE_FORWARD || - $compose_mode == RCUBE_COMPOSE_DRAFT) - { - $hasHtml = rcmail_has_html_part($MESSAGE['parts']); - $useHtml = ($hasHtml && $CONFIG['htmleditor']); - } + if (empty($attrib['name'])) + $attrib['name'] = 'editorSelect'; - $selector = ''; - - $attrib['name'] = '_editorSelect'; - $attrib['onchange'] = 'return rcmail_toggle_editor(this)'; - foreach ($choices as $value => $text) - { - $checked = ''; - if ((($value == 'html') && $useHtml) || - (($value != 'html') && !$useHtml)) - $attrib['checked'] = 'true'; - else - unset($attrib['checked']); + $attrib['onchange'] = "return rcmail_toggle_editor(this, '".$attrib['editorid']."', '_is_html')"; + + $select = new html_select($attrib); + + $select->add(Q(rcube_label('htmltoggle')), 'html'); + $select->add(Q(rcube_label('plaintoggle')), 'plain'); + return $select->show($useHtml ? 'html' : 'plain'); + + foreach ($choices as $value => $text) { $attrib['id'] = '_' . $value; - $rb = new radiobutton($attrib); - $selector .= sprintf("%s", - $rb->show($value), - $attrib['id'], - rcube_label($text)); + $attrib['value'] = $value; + $selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text))); } return $selector; } +function rcmail_store_target_selection($attrib) +{ + global $COMPOSE; + + $attrib['name'] = '_store_target'; + $select = rcmail_mailbox_select(array_merge($attrib, array( + 'noselection' => '- '.rcube_label('dontsave').' -', + 'folder_filter' => 'mail', + 'folder_rights' => 'w', + ))); + return $select->show($COMPOSE['param']['sent_mbox'], $attrib); +} + + +function rcmail_check_sent_folder($folder, $create=false) +{ + global $IMAP; + + if ($IMAP->mailbox_exists($folder, true)) { + return true; + } + + // folder may exist but isn't subscribed (#1485241) + if ($create) { + if (!$IMAP->mailbox_exists($folder)) + return $IMAP->create_mailbox($folder, true); + else + return $IMAP->subscribe($folder); + } + + return false; +} + + function get_form_tags($attrib) { - global $CONFIG, $OUTPUT, $MESSAGE_FORM, $SESS_HIDDEN_FIELD; + global $RCMAIL, $MESSAGE_FORM, $COMPOSE; $form_start = ''; - if (!strlen($MESSAGE_FORM)) + if (!$MESSAGE_FORM) { - $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task'])); + $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task)); $hiddenfields->add(array('name' => '_action', 'value' => 'send')); + $hiddenfields->add(array('name' => '_id', 'value' => $COMPOSE['id'])); - $form_start = empty($attrib['form']) ? '
' : ''; - $form_start .= "\n$SESS_HIDDEN_FIELD\n"; + $form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : ''; $form_start .= $hiddenfields->show(); } - - $form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '
' : ''; + + $form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '' : ''; $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form'; - - if (!strlen($MESSAGE_FORM)) - $OUTPUT->add_gui_object('messageform', $form_name); - + + if (!$MESSAGE_FORM) + $RCMAIL->output->add_gui_object('messageform', $form_name); + $MESSAGE_FORM = $form_name; - return array($form_start, $form_end); + return array($form_start, $form_end); } @@ -873,56 +1482,10 @@ $OUTPUT->add_handlers(array( 'priorityselector' => 'rcmail_priority_selector', 'editorselector' => 'rcmail_editor_selector', 'receiptcheckbox' => 'rcmail_receipt_checkbox', + 'dsncheckbox' => 'rcmail_dsn_checkbox', + 'storetarget' => 'rcmail_store_target_selection', )); -/****** get contacts for this user and add them to client scripts ********/ +$OUTPUT->send('compose'); -require_once('include/rcube_contacts.inc'); -require_once('include/rcube_ldap.inc'); -$CONTACTS = new rcube_contacts($DB, $USER->ID); -$CONTACTS->set_pagesize(1000); - -$a_contacts = array(); - -if ($result = $CONTACTS->list_records()) - { - while ($sql_arr = $result->iterate()) - if ($sql_arr['email']) - $a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name'])); - } -if (isset($CONFIG['ldap_public'])) - { - /* LDAP autocompletion */ - foreach ($CONFIG['ldap_public'] as $ldapserv_config) - { - if ($ldapserv_config['fuzzy_search'] != 1) - { - continue; - } - - $LDAP = new rcube_ldap($ldapserv_config); - $LDAP->connect(); - $LDAP->set_pagesize(1000); - - $results = $LDAP->search($ldapserv_config['mail_field'], ""); - - for ($i = 0; $i < $results->count; $i++) - { - if ($results->records[$i]['email'] != '') - { - $email = $results->records[$i]['email']; - $name = $results->records[$i]['name']; - - $a_contacts[] = format_email_recipient($email, JQ($name)); - } - } - $LDAP->close(); - } - } -if ($a_contacts) - { - $OUTPUT->set_env('contacts', $a_contacts); - } -parse_template('compose'); -?> \ No newline at end of file