X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Ffunc.inc;h=3c93cda1d993acdf1e6c2a9e88726b8223281e98;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=2f9060a561632bdfd9708681717097aba2b6bf56;hpb=e8a0682b96f5b7f297e58d101735ba20a0cc3a89;p=roundcube.git diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 2f9060a..3c93cda 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/mail/func.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2010, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,15 +15,24 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: func.inc 3058 2009-10-24 19:09:23Z alec $ + $Id: func.inc 5601 2011-12-14 09:08:54Z alec $ */ -$EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-z]{2,5})'; +// setup some global vars used by mail steps +$SENT_MBOX = $RCMAIL->config->get('sent_mbox'); +$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox'); +$SEARCH_MODS_DEFAULT = array( + '*' => array('subject'=>1, 'from'=>1), + $SENT_MBOX => array('subject'=>1, 'to'=>1), + $DRAFTS_MBOX => array('subject'=>1, 'to'=>1) +); -// actions that do not require imap connection -$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment'); +// actions that do not require imap connection here +$NOIMAP_ACTIONS = array('addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment', 'get'); +// always instantiate imap object (but not yet connect to server) +$RCMAIL->imap_init(); // log in to imap server if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) { @@ -36,11 +45,10 @@ if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) { $OUTPUT->send('login'); } - // set imap properties and session vars -if ($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC)) +if (strlen(trim($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true)))) $IMAP->set_mailbox(($_SESSION['mbox'] = $mbox)); -else +else if ($IMAP) $_SESSION['mbox'] = $IMAP->get_mailbox_name(); if (!empty($_GET['_page'])) @@ -48,44 +56,57 @@ if (!empty($_GET['_page'])) // set default sort col/order to session if (!isset($_SESSION['sort_col'])) - $_SESSION['sort_col'] = $CONFIG['message_sort_col']; + $_SESSION['sort_col'] = !empty($CONFIG['message_sort_col']) ? $CONFIG['message_sort_col'] : ''; if (!isset($_SESSION['sort_order'])) - $_SESSION['sort_order'] = $CONFIG['message_sort_order']; + $_SESSION['sort_order'] = strtoupper($CONFIG['message_sort_order']) == 'ASC' ? 'ASC' : 'DESC'; + +// set threads mode +$a_threading = $RCMAIL->config->get('message_threading', array()); +if (isset($_GET['_threads'])) { + if ($_GET['_threads']) + $a_threading[$_SESSION['mbox']] = true; + else + unset($a_threading[$_SESSION['mbox']]); + $RCMAIL->user->save_prefs(array('message_threading' => $a_threading)); +} +$IMAP->set_threading($a_threading[$_SESSION['mbox']]); // set message set for search result -if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) - { - $IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]); +if (!empty($_REQUEST['_search']) && isset($_SESSION['search']) + && $_SESSION['search_request'] == $_REQUEST['_search'] +) { + $IMAP->set_search_set($_SESSION['search']); $OUTPUT->set_env('search_request', $_REQUEST['_search']); $OUTPUT->set_env('search_text', $_SESSION['last_text_search']); - } +} // set main env variables, labels and page title -if (empty($RCMAIL->action) || $RCMAIL->action == 'list') - { +if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $mbox_name = $IMAP->get_mailbox_name(); - if (empty($RCMAIL->action)) - { + if (empty($RCMAIL->action)) { // initialize searching result if search_filter is used - if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') - { + if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { $search_request = md5($mbox_name.$_SESSION['search_filter']); - + $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $_SESSION['sort_col']); - $_SESSION['search'][$search_request] = $IMAP->get_search_set(); + $_SESSION['search'] = $IMAP->get_search_set(); + $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); } - - $OUTPUT->set_env('search_mods', $_SESSION['search_mods'] ? $_SESSION['search_mods'] : array('subject'=>'subject')); - // make sure the message count is refreshed (for default view) - $IMAP->messagecount($mbox_name, 'ALL', true); - } - - // set current mailbox in client environment + + $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT); + $OUTPUT->set_env('search_mods', $search_mods); + } + + // set current mailbox and some other vars in client environment $OUTPUT->set_env('mailbox', $mbox_name); - $OUTPUT->set_env('quota', $IMAP->get_capability('quota')); + $OUTPUT->set_env('pagesize', $IMAP->page_size); + $OUTPUT->set_env('quota', $IMAP->get_capability('QUOTA')); $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter()); + $OUTPUT->set_env('threading', (bool) $IMAP->threading); + $OUTPUT->set_env('threads', $IMAP->threading || $IMAP->get_capability('THREAD')); + $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0)); if ($CONFIG['flag_for_deletion']) $OUTPUT->set_env('flag_for_deletion', true); @@ -95,7 +116,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') $OUTPUT->set_env('skip_deleted', true); if ($CONFIG['display_next']) $OUTPUT->set_env('display_next', true); - + if ($CONFIG['forward_attachment']) + $OUTPUT->set_env('forward_attachment', true); if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); if ($CONFIG['drafts_mbox']) @@ -104,389 +126,285 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') $OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']); if (!$OUTPUT->ajax_call) - $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); + $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', + 'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage', + 'copy', 'move', 'quota'); - $OUTPUT->set_pagetitle(rcmail_localize_foldername($mbox_name)); - } + $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->mod_mailbox($mbox_name))); +} /** * return the message list as HTML table */ function rcmail_message_list($attrib) - { - global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT; - - $skin_path = $CONFIG['skin_path']; - $image_tag = '%s'; +{ + global $IMAP, $CONFIG, $OUTPUT; - // check to see if we have some settings for sorting - $sort_col = $_SESSION['sort_col']; - $sort_order = $_SESSION['sort_order']; - // add some labels to client $OUTPUT->add_label('from', 'to'); - // get message headers - $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order); - // add id to message list table if not specified if (!strlen($attrib['id'])) $attrib['id'] = 'rcubemessagelist'; - // allow the following attributes to be added to the tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary')); - - $out = '\n"; - // define list of cols to be displayed based on parameter or config - if (empty($attrib['columns'])) - $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); - else - $a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns'])); + if (empty($attrib['columns'])) { + $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); + $OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$CONFIG['dont_override'])); + } + else { + $a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns'])); + $attrib['columns'] = $a_show_cols; + } - // store column list in a session-variable - $_SESSION['list_columns'] = $a_show_cols; - - // define sortable columns - $a_sort_cols = array('subject', 'date', 'from', 'to', 'size'); + // save some variables for use in ajax list + $_SESSION['list_attrib'] = $attrib; $mbox = $IMAP->get_mailbox_name(); $delim = $IMAP->get_hierarchy_delimiter(); // show 'to' instead of 'from' in sent/draft messages if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 || strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0) - && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols)) + && (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false) $a_show_cols[$f] = 'to'; - - // add col definition - $out .= ''; - $out .= ''; - - foreach ($a_show_cols as $col) - $out .= ($col!='attachment') ? sprintf('', $col) : ''; - $out .= "\n"; + // make sure 'threads' and 'subject' columns are present + if (!in_array('subject', $a_show_cols)) + array_unshift($a_show_cols, 'subject'); + if (!in_array('threads', $a_show_cols)) + array_unshift($a_show_cols, 'threads'); - // add table title - $out .= "\n\n"; + $skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path']; - $javascript = ''; - foreach ($a_show_cols as $col) - { - // get column name - switch ($col) - { - case 'flag': - $col_name = sprintf($image_tag, $skin_path, $attrib['unflaggedicon'], ''); - break; - case 'attachment': - $col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], ''); - break; - default: - $col_name = Q(rcube_label($col)); - } - - // make sort links - $sort = ''; - if (in_array($col, $a_sort_cols)) - { - // have buttons configured - if (!empty($attrib['sortdescbutton']) || !empty($attrib['sortascbutton'])) - { - $sort = '  '; - - // asc link - if (!empty($attrib['sortascbutton'])) - { - $sort .= $OUTPUT->button(array( - 'command' => 'sort', - 'prop' => $col.'_ASC', - 'image' => $attrib['sortascbutton'], - 'align' => 'absmiddle', - 'title' => 'sortasc')); - } - - // desc link - if (!empty($attrib['sortdescbutton'])) - { - $sort .= $OUTPUT->button(array( - 'command' => 'sort', - 'prop' => $col.'_DESC', - 'image' => $attrib['sortdescbutton'], - 'align' => 'absmiddle', - 'title' => 'sortdesc')); - } - } - // just add a link tag to the header - else - { - $col_name = sprintf( - '%s', - JS_OBJECT_NAME, - $col, - rcube_label('sortby'), - $col_name); - } - } - - $sort_class = $col==$sort_col ? " sorted$sort_order" : ''; - - // put it all together - if ($col!='attachment') - $out .= '\n"; - else - $out .= '\n"; - } - - $out .= "\n\n"; - - // no messages in this mailbox - if (!sizeof($a_headers)) - $OUTPUT->show_message('nomessagesfound', 'notice'); - - $a_js_message_arr = array(); - - // create row for each message - foreach ($a_headers as $i => $header) //while (list($i, $header) = each($a_headers)) - { - $message_icon = $attach_icon = $flagged_icon = ''; - $js_row_arr = array(); - $zebra_class = $i%2 ? ' even' : ' odd'; - - // set messag attributes to javascript array - if ($header->deleted) - $js_row_arr['deleted'] = true; - if (!$header->seen) - $js_row_arr['unread'] = true; - if ($header->answered) - $js_row_arr['replied'] = true; - if ($header->forwarded) - $js_row_arr['forwarded'] = true; - if ($header->flagged) - $js_row_arr['flagged'] = true; - - // set message icon - if ($attrib['deletedicon'] && $header->deleted) - $message_icon = $attrib['deletedicon']; - else if ($attrib['repliedicon'] && $header->answered) - { - if ($attrib['forwardedrepliedicon'] && $header->forwarded) - $message_icon = $attrib['forwardedrepliedicon']; - else - $message_icon = $attrib['repliedicon']; - } - else if ($attrib['forwardedicon'] && $header->forwarded) - $message_icon = $attrib['forwardedicon']; - else if ($attrib['unreadicon'] && !$header->seen) - $message_icon = $attrib['unreadicon']; - else if ($attrib['messageicon']) - $message_icon = $attrib['messageicon']; - - if ($attrib['flaggedicon'] && $header->flagged) - $flagged_icon = $attrib['flaggedicon']; - else if ($attrib['unflaggedicon'] && !$header->flagged) - $flagged_icon = $attrib['unflaggedicon']; - - // set attachment icon - if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype)) - $attach_icon = $attrib['attachmenticon']; - - $out .= sprintf(''."\n", - $header->uid, - $header->seen ? '' : ' unread', - $header->deleted ? ' deleted' : '', - $header->flagged ? ' flagged' : '', - $zebra_class); - - $out .= sprintf("\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : ''); - - $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); - - // format each col - foreach ($a_show_cols as $col) - { - if ($col=='from' || $col=='to') - $cont = Q(rcmail_address_string($header->$col, 3, false, $attrib['addicon']), 'show'); - else if ($col=='subject') - { - $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show'; - $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid'; - $cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160); - if (empty($cont)) $cont = rcube_label('nosubject'); - $cont = $OUTPUT->browser->ie ? Q($cont) : sprintf('%s', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont)); - } - else if ($col=='flag') - $cont = $flagged_icon ? sprintf($image_tag, $skin_path, $flagged_icon, '') : ''; - else if ($col=='size') - $cont = show_bytes($header->$col); - else if ($col=='date') - $cont = format_date($header->date); - else - $cont = Q($header->$col); - - if ($col!='attachment') - $out .= '\n"; - else - $out .= sprintf("\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : ' '); - } - - $out .= "\n"; - - if (sizeof($js_row_arr)) - $a_js_message_arr[$header->uid] = $js_row_arr; - } - - // complete message table - $out .= "
 ' . "$col_name$sort' . "$col_name$sort
%s' . $cont . "%s
\n"; - - $message_count = $IMAP->messagecount(); - // set client env - $OUTPUT->add_gui_object('mailcontframe', 'mailcontframe'); $OUTPUT->add_gui_object('messagelist', $attrib['id']); - $OUTPUT->set_env('messagecount', $message_count); - $OUTPUT->set_env('current_page', $IMAP->list_page); - $OUTPUT->set_env('pagecount', ceil($message_count/$IMAP->page_size)); - $OUTPUT->set_env('sort_col', $sort_col); - $OUTPUT->set_env('sort_order', $sort_order); - - if ($attrib['messageicon']) - $OUTPUT->set_env('messageicon', $skin_path . $attrib['messageicon']); - if ($attrib['deletedicon']) - $OUTPUT->set_env('deletedicon', $skin_path . $attrib['deletedicon']); - if ($attrib['unreadicon']) - $OUTPUT->set_env('unreadicon', $skin_path . $attrib['unreadicon']); - if ($attrib['repliedicon']) - $OUTPUT->set_env('repliedicon', $skin_path . $attrib['repliedicon']); - if ($attrib['forwardedicon']) - $OUTPUT->set_env('forwardedicon', $skin_path . $attrib['forwardedicon']); - if ($attrib['forwardedrepliedicon']) - $OUTPUT->set_env('forwardedrepliedicon', $skin_path . $attrib['forwardedrepliedicon']); - if ($attrib['attachmenticon']) - $OUTPUT->set_env('attachmenticon', $skin_path . $attrib['attachmenticon']); - if ($attrib['flaggedicon']) - $OUTPUT->set_env('flaggedicon', $skin_path . $attrib['flaggedicon']); - if ($attrib['unflaggedicon']) - $OUTPUT->set_env('unflaggedicon', $skin_path . $attrib['unflaggedicon']); - - $OUTPUT->set_env('messages', $a_js_message_arr); + $OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads'])); + $OUTPUT->set_env('sort_col', $_SESSION['sort_col']); + $OUTPUT->set_env('sort_order', $_SESSION['sort_order']); + $OUTPUT->set_env('messages', array()); $OUTPUT->set_env('coltypes', $a_show_cols); - + $OUTPUT->include_script('list.js'); - - return $out; - } + + $thead = ''; + foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell) + $thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']); + + return html::tag('table', + $attrib, + html::tag('thead', null, html::tag('tr', null, $thead)) . + html::tag('tbody', null, ''), + array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary')); +} /** * return javascript commands to add rows to the message list - * or to replace the whole list (IE only) */ -function rcmail_js_message_list($a_headers, $insert_top=FALSE, $replace=TRUE) - { - global $CONFIG, $IMAP, $OUTPUT; +function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null) +{ + global $CONFIG, $IMAP, $RCMAIL, $OUTPUT; - if (empty($_SESSION['list_columns'])) - $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); - else - $a_show_cols = $_SESSION['list_columns']; + if (empty($a_show_cols)) { + if (!empty($_SESSION['list_attrib']['columns'])) + $a_show_cols = $_SESSION['list_attrib']['columns']; + else + $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); + } + else { + if (!is_array($a_show_cols)) + $a_show_cols = preg_split('/[\s,;]+/', strip_quotes($a_show_cols)); + $head_replace = true; + } $mbox = $IMAP->get_mailbox_name(); $delim = $IMAP->get_hierarchy_delimiter(); - + + // make sure 'threads' and 'subject' columns are present + if (!in_array('subject', $a_show_cols)) + array_unshift($a_show_cols, 'subject'); + if (!in_array('threads', $a_show_cols)) + array_unshift($a_show_cols, 'threads'); + + $_SESSION['list_attrib']['columns'] = $a_show_cols; + // show 'to' instead of 'from' in sent/draft messages if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 || strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0) && (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false) $a_show_cols[$f] = 'to'; - $browser = new rcube_browser; + // Make sure there are no duplicated columns (#1486999) + $a_show_cols = array_unique($a_show_cols); + + // Plugins may set header's list_cols/list_flags and other rcube_mail_header variables + // and list columns + $plugin = $RCMAIL->plugins->exec_hook('messages_list', + array('messages' => $a_headers, 'cols' => $a_show_cols)); - $OUTPUT->command('set_message_coltypes', $a_show_cols); + $a_show_cols = $plugin['cols']; + $a_headers = $plugin['messages']; - // remove 'attachment' and 'flag' columns, we don't need them here - if(($key = array_search('attachment', $a_show_cols)) !== FALSE) - unset($a_show_cols[$key]); - if(($key = array_search('flag', $a_show_cols)) !== FALSE) - unset($a_show_cols[$key]); + $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL; - if ($browser->ie && $replace) - $OUTPUT->command('offline_message_list', true); + $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead); + + if (empty($a_headers)) + return; + + // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here + foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) { + if (($key = array_search($col, $a_show_cols)) !== FALSE) + unset($a_show_cols[$key]); + } // loop through message headers - foreach ($a_headers as $n => $header) - { - $a_msg_cols = array(); - $a_msg_flags = array(); - + foreach ($a_headers as $n => $header) { if (empty($header)) continue; + $a_msg_cols = array(); + $a_msg_flags = array(); + $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']); // format each col; similar as in rcmail_message_list() - foreach ($a_show_cols as $col) - { - if ($col=='from' || $col=='to') + foreach ($a_show_cols as $col) { + if (in_array($col, array('from', 'to', 'cc', 'replyto'))) $cont = Q(rcmail_address_string($header->$col, 3), 'show'); - else if ($col=='subject') - { - $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show'; - $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid'; - $cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160); + else if ($col=='subject') { + $cont = trim($IMAP->decode_header($header->$col)); if (!$cont) $cont = rcube_label('nosubject'); - $cont = $browser->ie ? Q($cont) : sprintf('%s', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont)); - } + $cont = Q($cont); + } else if ($col=='size') $cont = show_bytes($header->$col); else if ($col=='date') $cont = format_date($header->date); else $cont = Q($header->$col); - + $a_msg_cols[$col] = $cont; - } + } + + $a_msg_flags = array_change_key_case(array_map('intval', (array) $header->flags)); + if ($header->depth) + $a_msg_flags['depth'] = $header->depth; + else if ($header->has_children) + $roots[] = $header->uid; + if ($header->parent_uid) + $a_msg_flags['parent_uid'] = $header->parent_uid; + if ($header->has_children) + $a_msg_flags['has_children'] = $header->has_children; + if ($header->unread_children) + $a_msg_flags['unread_children'] = $header->unread_children; + if ($header->others['list-post']) + $a_msg_flags['ml'] = 1; + if ($header->priority) + $a_msg_flags['prio'] = (int) $header->priority; + + $a_msg_flags['ctype'] = Q($header->ctype); + $a_msg_flags['mbox'] = $mbox; + + // merge with plugin result (Deprecated, use $header->flags) + if (!empty($header->list_flags) && is_array($header->list_flags)) + $a_msg_flags = array_merge($a_msg_flags, $header->list_flags); + if (!empty($header->list_cols) && is_array($header->list_cols)) + $a_msg_cols = array_merge($a_msg_cols, $header->list_cols); - if ($header->deleted) - $a_msg_flags['deleted'] = 1; - if (!$header->seen) - $a_msg_flags['unread'] = 1; - if ($header->answered) - $a_msg_flags['replied'] = 1; - if ($header->forwarded) - $a_msg_flags['forwarded'] = 1; - if ($header->flagged) - $a_msg_flags['flagged'] = 1; - - if ($browser->ie) - $a_msg_cols = rc_utf8_clean($a_msg_cols); - $OUTPUT->command('add_message_row', $header->uid, $a_msg_cols, $a_msg_flags, - preg_match("/multipart\/m/i", $header->ctype), $insert_top); + } + + if ($IMAP->threading) { + $OUTPUT->command('init_threads', (array) $roots, $mbox); + } +} + + +/* + * Creates for message list table + */ +function rcmail_message_list_head($attrib, $a_show_cols) +{ + global $CONFIG; + + $skin_path = $_SESSION['skin_path']; + $image_tag = html::img(array('src' => "%s%s", 'alt' => "%s")); + + // check to see if we have some settings for sorting + $sort_col = $_SESSION['sort_col']; + $sort_order = $_SESSION['sort_order']; + + // define sortable columns + $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc'); + + if (!empty($attrib['optionsmenuicon'])) { + $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')"; + if ($attrib['optionsmenuicon'] === true || $attrib['optionsmenuicon'] == 'true') + $list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu', + 'id' => 'listmenulink', 'title' => rcube_label('listoptions'))); + else + $list_menu = html::a(array('href' => '#', 'onclick' => $onclick), + html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], + 'id' => 'listmenulink', 'title' => rcube_label('listoptions'))) + ); + } + else + $list_menu = ''; + + $cells = array(); + + foreach ($a_show_cols as $col) { + // get column name + switch ($col) { + case 'flag': + $col_name = ' '; + break; + case 'attachment': + case 'priority': + case 'status': + $col_name = ' '; + break; + case 'threads': + $col_name = $list_menu; + break; + default: + $col_name = Q(rcube_label($col)); } - if ($browser->ie && $replace) - $OUTPUT->command('offline_message_list', false); + // make sort links + if (in_array($col, $a_sort_cols)) + $col_name = html::a(array('href'=>"./#sort", 'onclick' => 'return '.JS_OBJECT_NAME.".command('sort','".$col."',this)", 'title' => rcube_label('sortby')), $col_name); + + $sort_class = $col == $sort_col ? " sorted$sort_order" : ''; + $class_name = $col.$sort_class; + + // put it all together + $cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name); } + return $cells; +} + /** * return an HTML iframe for loading mail content */ function rcmail_messagecontent_frame($attrib) { - global $OUTPUT; - + global $OUTPUT, $RCMAIL; + if (empty($attrib['id'])) $attrib['id'] = 'rcmailcontentwindow'; $attrib['name'] = $attrib['id']; - $OUTPUT->set_env('contentframe', $attrib['id']); + if ($RCMAIL->config->get('preview_pane')) + $OUTPUT->set_env('contentframe', $attrib['id']); $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); return html::iframe($attrib); @@ -495,102 +413,40 @@ function rcmail_messagecontent_frame($attrib) function rcmail_messagecount_display($attrib) { - global $IMAP, $OUTPUT; - - if (!$attrib['id']) - $attrib['id'] = 'rcmcountdisplay'; - - $OUTPUT->add_gui_object('countdisplay', $attrib['id']); - - return html::span($attrib, rcmail_get_messagecount_text()); - } - - -function rcmail_quota_display($attrib) - { - global $OUTPUT, $COMM_PATH; + global $RCMAIL; if (!$attrib['id']) - $attrib['id'] = 'rcmquotadisplay'; - - if(isset($attrib['display'])) - $_SESSION['quota_display'] = $attrib['display']; - - $OUTPUT->add_gui_object('quotadisplay', $attrib['id']); - - $quota = rcmail_quota_content(NULL, $attrib); - - if (is_array($quota)) { - $OUTPUT->add_script('$(document).ready(function(){ - rcmail.set_quota('.json_serialize($quota).')});', 'foot'); - $quota = ''; - } - - return html::span($attrib, $quota); - } - - -function rcmail_quota_content($quota=NULL, $attrib=NULL) - { - global $IMAP, $COMM_PATH, $RCMAIL; - - $display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : ''; + $attrib['id'] = 'rcmcountdisplay'; - if (empty($quota)) { - if (!$IMAP->get_capability('QUOTA')) - return rcube_label('unknown'); - else - $quota = $IMAP->get_quota(); - } + $RCMAIL->output->add_gui_object('countdisplay', $attrib['id']); - if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited'))) - { - $quota_result = sprintf('%s / %s (%.0f%%)', - show_bytes($quota['used'] * 1024), show_bytes($quota['total'] * 1024), - $quota['percent']); - - if ($display == 'image') { - $quota_result = array( - 'percent' => $quota['percent'], - 'title' => $quota_result, - ); - if ($attrib['width']) - $quota_result['width'] = $attrib['width']; - if ($attrib['height']) - $quota_result['height'] = $attrib['height']; - } - } - else - return rcube_label('unlimited'); + $content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading'); - return $quota_result; + return html::span($attrib, $content); } function rcmail_get_messagecount_text($count=NULL, $page=NULL) { - global $IMAP, $MESSAGE; - - if (isset($MESSAGE->index)) - { - return rcube_label(array('name' => 'messagenrof', - 'vars' => array('nr' => $MESSAGE->index+1, - 'count' => $count!==NULL ? $count : $IMAP->messagecount()))); - } + global $RCMAIL, $IMAP; if ($page===NULL) $page = $IMAP->list_page; - + $start_msg = ($page-1) * $IMAP->page_size + 1; - $max = $count!==NULL ? $count : $IMAP->messagecount(); + + if ($count!==NULL) + $max = $count; + else if ($RCMAIL->action) + $max = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); if ($max==0) $out = rcube_label('mailboxempty'); else - $out = rcube_label(array('name' => 'messagesfromto', - 'vars' => array('from' => $start_msg, - 'to' => min($max, $start_msg + $IMAP->page_size - 1), - 'count' => $max))); + $out = rcube_label(array('name' => $IMAP->threading ? 'threadsfromto' : 'messagesfromto', + 'vars' => array('from' => $start_msg, + 'to' => min($max, $start_msg + $IMAP->page_size - 1), + 'count' => $max))); return Q($out); } @@ -608,6 +464,7 @@ function rcmail_mailbox_name_display($attrib) return html::span($attrib, rcmail_get_mailbox_name_text()); } + function rcmail_get_mailbox_name_text() { global $RCMAIL; @@ -615,22 +472,46 @@ function rcmail_get_mailbox_name_text() } -function rcmail_send_unread_count($mbox_name, $force=false) +function rcmail_send_unread_count($mbox_name, $force=false, $count=null) { global $RCMAIL; - - $old_unseen = $_SESSION['unseen_count'][$mbox_name]; - $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force); + + $old_unseen = rcmail_get_unseen_count($mbox_name); + + if ($count === null) + $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force); + else + $unseen = $count; if ($unseen != $old_unseen || ($mbox_name == 'INBOX')) $RCMAIL->output->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX')); - // @TODO: this data is doubled (session and cache tables) if caching is enabled - $_SESSION['unseen_count'][$mbox_name] = $unseen; - + rcmail_set_unseen_count($mbox_name, $unseen); + return $unseen; } - + + +function rcmail_set_unseen_count($mbox_name, $count) +{ + // @TODO: this data is doubled (session and cache tables) if caching is enabled + + // Make sure we have an array here (#1487066) + if (!is_array($_SESSION['unseen_count'])) + $_SESSION['unseen_count'] = array(); + + $_SESSION['unseen_count'][$mbox_name] = $count; +} + + +function rcmail_get_unseen_count($mbox_name) +{ + if (is_array($_SESSION['unseen_count']) && array_key_exists($mbox_name, $_SESSION['unseen_count'])) + return $_SESSION['unseen_count'][$mbox_name]; + else + return null; +} + /** * Sets message is_safe flag according to 'show_images' option value @@ -660,6 +541,7 @@ function rcmail_check_safe(&$message) } } + /** * Cleans up the given message HTML Body (for displaying) * @@ -668,16 +550,16 @@ function rcmail_check_safe(&$message) * @param array CID map replaces (inline images) * @return string Clean HTML */ -function rcmail_wash_html($html, $p = array(), $cid_replaces) +function rcmail_wash_html($html, $p, $cid_replaces) { global $REMOTE_OBJECTS; - + $p += array('safe' => false, 'inline_html' => true); // special replacements (not properly handled by washtml class) $html_search = array( '/(<\/nobr>)(\s+)()/i', // space(s) between - '/.*<\/title>/i', // PHP bug #32547 workaround: remove title tag + '/<title[^>]*>[^<]*<\/title>/i', // PHP bug #32547 workaround: remove title tag '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/', // byte-order mark (only outlook?) '/<html\s[^>]+>/i', // washtml/DOMDocument cannot handle xml namespaces ); @@ -687,22 +569,37 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) '', '<html>', ); - $html = preg_replace($html_search, $html_replace, $html); + $html = preg_replace($html_search, $html_replace, trim($html)); + + // PCRE errors handling (#1486856), should we use something like for every preg_* use? + if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) { + $errstr = "Could not clean up HTML message! PCRE Error: $preg_error."; + + if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR) + $errstr .= " Consider raising pcre.backtrack_limit!"; + if ($preg_error == PREG_RECURSION_LIMIT_ERROR) + $errstr .= " Consider raising pcre.recursion_limit!"; + + raise_error(array('code' => 620, 'type' => 'php', + 'line' => __LINE__, 'file' => __FILE__, + 'message' => $errstr), true, false); + return ''; + } // fix (unknown/malformed) HTML tags before "wash" $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html); // charset was converted to UTF-8 in rcube_imap::get_message_part(), - // -> change charset specification in HTML accordingly - $charset_pattern = '(<meta\s+[^>]*)(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)'; - if (preg_match("/$charset_pattern/Ui", $html)) { - $html = preg_replace("/$charset_pattern/i", '\\1\\2='.RCMAIL_CHARSET, $html); - } - else { - // add meta content-type to malformed messages, washtml cannot work without that - if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html)) - $html = '<head></head>'. $html; - $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0); + // change/add charset specification in HTML accordingly, + // washtml cannot work without that + $meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />'; + + // remove old meta tag and add the new one, making sure + // that it is placed in the head (#1488093) + $html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html); + $html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount); + if (!$rcount) { + $html = '<head>' . $meta . '</head>' . $html; } // turn relative into absolute urls @@ -717,7 +614,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) 'cid_map' => $cid_replaces, 'html_elements' => array('body'), ); - + if (!$p['inline_html']) { $wash_opts['html_elements'] = array('html','head','title','body'); } @@ -725,16 +622,29 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $wash_opts['html_elements'][] = 'link'; $wash_opts['html_attribs'] = array('rel','type'); } - + + // overwrite washer options with options from plugins + if (isset($p['html_elements'])) + $wash_opts['html_elements'] = $p['html_elements']; + if (isset($p['html_attribs'])) + $wash_opts['html_attribs'] = $p['html_attribs']; + + // initialize HTML washer $washer = new washtml($wash_opts); - $washer->add_callback('form', 'rcmail_washtml_callback'); + + if (!$p['skip_washer_form_callback']) + $washer->add_callback('form', 'rcmail_washtml_callback'); // allow CSS styles, will be sanitized by rcmail_washtml_callback() - $washer->add_callback('style', 'rcmail_washtml_callback'); + if (!$p['skip_washer_style_callback']) + $washer->add_callback('style', 'rcmail_washtml_callback'); + + // Remove non-UTF8 characters (#1487813) + $html = rc_utf8_clean($html); $html = $washer->wash($html); $REMOTE_OBJECTS = $washer->extlinks; - + return $html; } @@ -750,10 +660,11 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) function rcmail_print_body($part, $p = array()) { global $RCMAIL; - + // trigger plugin hook $data = $RCMAIL->plugins->exec_hook('message_part_before', - array('type' => $part->ctype_secondary, 'body' => $part->body) + $p + array('safe' => false, 'plain' => false, 'inline_html' => true)); + array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id) + + $p + array('safe' => false, 'plain' => false, 'inline_html' => true)); // convert html to text/plain if ($data['type'] == 'html' && $data['plain']) { @@ -769,7 +680,7 @@ function rcmail_print_body($part, $p = array()) // text/enriched else if ($data['type'] == 'enriched') { $part->ctype_secondary = 'html'; - require_once('lib/enriched.inc'); + require_once(INSTALL_PATH . 'program/lib/enriched.inc'); $body = Q(enriched_to_html($data['body']), 'show'); } else { @@ -777,119 +688,163 @@ function rcmail_print_body($part, $p = array()) $body = $part->body; $part->ctype_secondary = $data['type'] = 'plain'; } - + // free some memory (hopefully) unset($data['body']); // plaintext postprocessing if ($part->ctype_secondary == 'plain') - $body = rcmail_plain_body($body); + $body = rcmail_plain_body($body, $part->ctype_parameters['format'] == 'flowed'); // allow post-processing of the message body - $data = $RCMAIL->plugins->exec_hook('message_part_after', array('type' => $part->ctype_secondary, 'body' => $body) + $data); + $data = $RCMAIL->plugins->exec_hook('message_part_after', + array('type' => $part->ctype_secondary, 'body' => $body, 'id' => $part->mime_id) + $data); return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']); } + /** * Handle links and citation marks in plain text message * - * @param string Plain text string + * @param string Plain text string + * @param boolean Text uses format=flowed + * * @return string Formatted HTML string */ -function rcmail_plain_body($body) +function rcmail_plain_body($body, $flowed=false) { + global $RCMAIL; + // make links and email-addresses clickable - $replacements = new rcube_string_replacer; - + $replacer = new rcube_string_replacer; + // search for patterns like links and e-mail addresses - $body = preg_replace_callback($replacements->link_pattern, array($replacements, 'link_callback'), $body); - $body = preg_replace_callback($replacements->mailto_pattern, array($replacements, 'mailto_callback'), $body); + $body = preg_replace_callback($replacer->link_pattern, array($replacer, 'link_callback'), $body); + $body = preg_replace_callback($replacer->mailto_pattern, array($replacer, 'mailto_callback'), $body); // split body into single lines - $a_lines = preg_split('/\r?\n/', $body); - $q_lines = array(); + $body = preg_split('/\r?\n/', $body); $quote_level = 0; + $last = -1; // find/mark quoted lines... - for ($n=0, $cnt=count($a_lines); $n < $cnt; $n++) { - $q = 0; - - if ($a_lines[$n][0] == '>' && preg_match('/^(>+\s*)+/', $a_lines[$n], $regs)) { + for ($n=0, $cnt=count($body); $n < $cnt; $n++) { + if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) { $q = strlen(preg_replace('/\s/', '', $regs[0])); - $a_lines[$n] = substr($a_lines[$n], strlen($regs[0])); + $body[$n] = substr($body[$n], strlen($regs[0])); - if ($q > $quote_level) - $q_lines[$n]['quote'] = $q - $quote_level; - else if ($q < $quote_level) - $q_lines[$n]['endquote'] = $quote_level - $q; + if ($q > $quote_level) { + $body[$n] = $replacer->get_replacement($replacer->add( + str_repeat('<blockquote>', $q - $quote_level))) . $body[$n]; + } + else if ($q < $quote_level) { + $body[$n] = $replacer->get_replacement($replacer->add( + str_repeat('</blockquote>', $quote_level - $q))) . $body[$n]; + } + else if ($flowed) { + // previous line is flowed + if (isset($body[$last]) && $body[$n] + && $body[$last][strlen($body[$last])-1] == ' ') { + // merge lines + $body[$last] .= $body[$n]; + unset($body[$n]); + } + else { + $last = $n; + } + } + } + else { + $q = 0; + if ($flowed) { + // sig separator - line is fixed + if ($body[$n] == '-- ') { + $last = $last_sig = $n; + } + else { + // remove space-stuffing + if ($body[$n][0] == ' ') + $body[$n] = substr($body[$n], 1); + + // previous line is flowed? + if (isset($body[$last]) && $body[$n] + && $last !== $last_sig + && $body[$last][strlen($body[$last])-1] == ' ' + ) { + $body[$last] .= $body[$n]; + unset($body[$n]); + } + else { + $last = $n; + } + } + if ($quote_level > 0) + $body[$last] = $replacer->get_replacement($replacer->add( + str_repeat('</blockquote>', $quote_level))) . $body[$last]; + } + else if ($quote_level > 0) + $body[$n] = $replacer->get_replacement($replacer->add( + str_repeat('</blockquote>', $quote_level))) . $body[$n]; } - else if ($quote_level > 0) - $q_lines[$n]['endquote'] = $quote_level; $quote_level = $q; } - // quote plain text - $body = Q(join("\n", $a_lines), 'replace', false); - - // colorize signature - if (($sp = strrpos($body, '-- ')) !== false) - if (($sp == 0 || $body[$sp-1] == "\n") && $body[$sp+3] == "\n") { - $body = substr($body, 0, max(0, $sp)) - .'<span class="sig">'.substr($body, $sp).'</span>'; + $body = join("\n", $body); + + // quote plain text (don't use Q() here, to display entities "as is") + $table = get_html_translation_table(HTML_SPECIALCHARS); + unset($table['?']); + $body = strtr($body, $table); + + // colorize signature (up to <sig_max_lines> lines) + $len = strlen($body); + $sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15); + 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)) + .'<span class="sig">'.substr($body, $sp).'</span>'; + break; } + } - // colorize quoted lines - $a_lines = preg_split('/\n/', $body); - foreach ($q_lines as $i => $q) - if ($q['quote']) - $a_lines[$i] = str_repeat('<blockquote>', $q['quote']) . $a_lines[$i]; - else if ($q['endquote']) - $a_lines[$i] = str_repeat('</blockquote>', $q['endquote']) . $a_lines[$i]; - - // insert the links for urls and mailtos - $body = $replacements->resolve(join("\n", $a_lines)); - - return $body; -} - + // insert url/mailto links and citation tags + $body = $replacer->resolve($body); -/** - * add a string to the replacement array and return a replacement string - */ -function rcmail_str_replacement($str, &$rep) -{ - static $count = 0; - $rep[$count] = stripslashes($str); - return "##string_replacement{".($count++)."}##"; + return $body; } /** * Callback function for washtml cleaning class */ -function rcmail_washtml_callback($tagname, $attrib, $content) +function rcmail_washtml_callback($tagname, $attrib, $content, $washtml) { switch ($tagname) { case 'form': $out = html::div('form', $content); break; - + case 'style': // decode all escaped entities and reduce to ascii strings - $stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entity_decode($content)); - + $stripped = preg_replace('/[^a-zA-Z\(:;]/', '', rcmail_xss_entity_decode($content)); + // now check for evil strings like expression, behavior or url() - if (!preg_match('/expression|behavior|url\(|import/', $stripped)) { - $out = html::tag('style', array('type' => 'text/css'), $content); + if (!preg_match('/expression|behavior|javascript:|import[^a]/i', $stripped)) { + if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url(')) + $washtml->extlinks = true; + else + $out = html::tag('style', array('type' => 'text/css'), $content); break; } - + default: $out = ''; } - + return $out; } @@ -902,8 +857,8 @@ function rcmail_html_tag_callback($matches) $tagname = $matches[2]; $tagname = preg_replace(array( - '/:.*$/', // Microsoft's Smart Tags <st1:xxxx> - '/[^a-z0-9_-]/i', // forbidden characters + '/:.*$/', // Microsoft's Smart Tags <st1:xxxx> + '/[^a-z0-9_\[\]\!-]/i', // forbidden characters ), '', $tagname); return $matches[1].$tagname; @@ -917,13 +872,13 @@ function rcmail_message_headers($attrib, $headers=NULL) { global $IMAP, $OUTPUT, $MESSAGE, $PRINT_MODE, $RCMAIL; static $sa_attrib; - + // keep header table attrib if (is_array($attrib) && !$sa_attrib) $sa_attrib = $attrib; else if (!is_array($attrib) && is_array($sa_attrib)) $attrib = $sa_attrib; - + if (!isset($MESSAGE)) return FALSE; @@ -932,55 +887,84 @@ function rcmail_message_headers($attrib, $headers=NULL) $headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers; // show these headers - $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto', 'date'); + $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto', + 'mail-reply-to', 'mail-followup-to', 'date'); $output_headers = array(); foreach ($standard_headers as $hkey) { - if (!$headers[$hkey]) + if ($headers[$hkey]) + $value = $headers[$hkey]; + else if ($headers['others'][$hkey]) + $value = $headers['others'][$hkey]; + else continue; if ($hkey == 'date') { if ($PRINT_MODE) - $header_value = format_date($headers[$hkey], $RCMAIL->config->get('date_long', 'x')); + $header_value = format_date($value, $RCMAIL->config->get('date_long', 'x')); else - $header_value = format_date($headers[$hkey]); + $header_value = format_date($value); } else if ($hkey == 'replyto') { if ($headers['replyto'] != $headers['from']) - $header_value = rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']); + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + else + continue; + } + else if ($hkey == 'mail-reply-to') { + if ($headers['mail-replyto'] != $headers['reply-to'] + && $headers['reply-to'] != $headers['from'] + ) + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); else continue; } + else if ($hkey == 'mail-followup-to') { + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + } else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) - $header_value = rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']); - else if ($hkey == 'subject' && empty($headers[$hkey])) + $header_value = rcmail_address_string($value, null, true, $attrib['addicon']); + else if ($hkey == 'subject' && empty($value)) $header_value = rcube_label('nosubject'); else - $header_value = trim($IMAP->decode_header($headers[$hkey])); - - $output_headers[$hkey] = array('title' => rcube_label($hkey), 'value' => $header_value, 'raw' => $headers[$hkey]); + $header_value = trim($IMAP->decode_header($value)); + + $output_headers[$hkey] = array( + 'title' => rcube_label(preg_replace('/(^mail-|-)/', '', $hkey)), + 'value' => $header_value, 'raw' => $value + ); } - - $plugin = $RCMAIL->plugins->exec_hook('message_headers_output', array('output' => $output_headers, 'headers' => $MESSAGE->headers)); - + + $plugin = $RCMAIL->plugins->exec_hook('message_headers_output', + array('output' => $output_headers, 'headers' => $MESSAGE->headers)); + // compose html table $table = new html_table(array('cols' => 2)); - + foreach ($plugin['output'] as $hkey => $row) { $table->add(array('class' => 'header-title'), Q($row['title'])); - $table->add(array('class' => $hkey, 'width' => "90%"), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'))); + $table->add(array('class' => 'header '.$hkey), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'))); } - // all headers division - $table->add(array('colspan' => 2, 'class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('load-headers','',this)"), ''); - $table->add_row(array('id' => "all-headers")); - $table->add(array('colspan' => 2, 'class' => "all"), html::div(array('id' => 'headers-source'), '')); - + return $table->show($attrib); +} + + +/** + * return block to show full message headers + */ +function rcmail_message_full_headers($attrib, $headers=NULL) +{ + global $OUTPUT; + + $html = html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('load-headers','',this)"), ''); + $html .= html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), '')); + $OUTPUT->add_gui_object('all_headers_row', 'all-headers'); $OUTPUT->add_gui_object('all_headers_box', 'headers-source'); - return $table->show($attrib); - } + return html::div($attrib, $html); +} /** @@ -991,17 +975,17 @@ function rcmail_message_headers($attrib, $headers=NULL) */ function rcmail_message_body($attrib) { - global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $REMOTE_OBJECTS; + global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $RCMAIL, $REMOTE_OBJECTS; if (!is_array($MESSAGE->parts) && empty($MESSAGE->body)) return ''; - + if (!$attrib['id']) $attrib['id'] = 'rcmailMsgBody'; $safe_mode = $MESSAGE->is_safe || intval($_GET['_safe']); $out = ''; - + $header_attrib = array(); foreach ($attrib as $attr => $value) if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs)) @@ -1022,40 +1006,68 @@ function rcmail_message_body($attrib) if (!isset($part->body)) $part->body = $MESSAGE->get_part_content($part->mime_id); + // message is cached but not exists (#1485443), or other error + if ($part->body === false) { + rcmail_message_error($MESSAGE->uid); + } + + $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array( + 'part' => $part, 'prefix' => '')); + $body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html'])); - if ($part->ctype_secondary == 'html') - $out .= html::div('message-htmlpart', rcmail_html4inline($body, $attrib['id'])); + if ($part->ctype_secondary == 'html') { + $body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode); + $div_attr = array('class' => 'message-htmlpart'); + $style = array(); + + if (!empty($attrs)) { + foreach ($attrs as $a_idx => $a_val) + $style[] = $a_idx . ': ' . $a_val; + if (!empty($style)) + $div_attr['style'] = implode('; ', $style); + } + + $out .= html::div($div_attr, $plugin['prefix'] . $body); + } else - $out .= html::div('message-part', $body); + $out .= html::div('message-part', $plugin['prefix'] . $body); } } } - else - $out .= html::div('message-part', html::tag('pre', array(), - rcmail_plain_body(Q($MESSAGE->body, 'strict', false)))); + else { + $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array( + 'part' => $MESSAGE, 'prefix' => '')); - $ctype_primary = strtolower($MESSAGE->structure->ctype_primary); - $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary); + $out .= html::div('message-part', $plugin['prefix'] . html::tag('pre', array(), + rcmail_plain_body(Q($MESSAGE->body, 'strict', false)))); + } // list images after mail body - if ($CONFIG['inline_images'] - && $ctype_primary == 'multipart' - && !empty($MESSAGE->attachments) - && !strstr($message_body, '<html')) - { + if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { - if (strpos($attach_prop->mimetype, 'image/') === 0) { + // skip inline images + if ($attach_prop->content_id && $attach_prop->disposition == 'inline') { + continue; + } + + // Content-Type: image/*... + if (preg_match('/^image\//i', $attach_prop->mimetype) || + // ...or known file extension: many clients are using application/octet-stream + ($attach_prop->filename && + preg_match('/^application\/octet-stream$/i', $attach_prop->mimetype) && + preg_match('/\.(jpg|jpeg|png|gif|bmp)$/i', $attach_prop->filename)) + ) { $out .= html::tag('hr') . html::p(array('align' => "center"), html::img(array( - 'src' => $MESSAGE->get_part_url($attach_prop->mime_id), + 'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true), 'title' => $attach_prop->filename, 'alt' => $attach_prop->filename, ))); } } } - + // tell client that there are blocked remote objects if ($REMOTE_OBJECTS && !$safe_mode) $OUTPUT->set_env('blockedobjects', true); @@ -1074,8 +1086,8 @@ function rcmail_resolve_base($body) $replacer = new rcube_base_replacer($regs[2]); // replace all relative paths - $body = preg_replace_callback('/(src|background|href)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Ui', array($replacer, 'callback'), $body); - $body = preg_replace_callback('/(url\s*\()(["\']?)([\.\/]+[^"\'\)\s]+)(\2)\)/Ui', array($replacer, 'callback'), $body); + $body = preg_replace_callback('/(src|background|href)=(["\']?)([^"\'\s]+)(\2|\s|>)/Ui', array($replacer, 'callback'), $body); + $body = preg_replace_callback('/(url\s*\()(["\']?)([^"\'\)\s]+)(\2)\)/Ui', array($replacer, 'callback'), $body); } return $body; @@ -1084,73 +1096,131 @@ function rcmail_resolve_base($body) /** * modify a HTML message that it can be displayed inside a HTML page */ -function rcmail_html4inline($body, $container_id) - { +function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null, $allow_remote=false) +{ $last_style_pos = 0; $body_lc = strtolower($body); - + $cont_id = $container_id.($body_id ? ' div.'.$body_id : ''); + // find STYLE tags while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos))) - { + { $pos = strpos($body_lc, '>', $pos)+1; // replace all css definitions with #container [def] - $styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id); + $styles = rcmail_mod_css_styles( + substr($body, $pos, $pos2-$pos), $cont_id, $allow_remote); $body = substr($body, 0, $pos) . $styles . substr($body, $pos2); $body_lc = strtolower($body); $last_style_pos = $pos2; - } + } // modify HTML links to open a new window if clicked $GLOBALS['rcmail_html_container_id'] = $container_id; $body = preg_replace_callback('/<(a|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body); unset($GLOBALS['rcmail_html_container_id']); - // add comments arround html and other tags - $out = preg_replace(array( + $body = preg_replace(array( + // add comments arround html and other tags '/(<!DOCTYPE[^>]*>)/i', '/(<\?xml[^>]*>)/i', '/(<\/?html[^>]*>)/i', '/(<\/?head[^>]*>)/i', '/(<title[^>]*>.*<\/title>)/Ui', - '/(<\/?meta[^>]*>)/i'), - '<!--\\1-->', + '/(<\/?meta[^>]*>)/i', + // quote <? of php and xml files that are specified as text/html + '/<\?/', + '/\?>/', + // replace <body> with <div> + '/<body([^>]*)>/i', + '/<\/body>/i', + ), + array( + '<!--\\1-->', + '<!--\\1-->', + '<!--\\1-->', + '<!--\\1-->', + '<!--\\1-->', + '<!--\\1-->', + '<?', + '?>', + '<div class="'.$body_id.'"\\1>', + '</div>', + ), $body); - $out = preg_replace( - array('/<body([^>]*)>/i', '/<\/body>/i'), - array('<div class="rcmBody"\\1>', '</div>'), - $out); + $attributes = array(); - // quote <? of php and xml files that are specified as text/html - $out = preg_replace(array('/<\?/', '/\?>/'), array('<?', '?>'), $out); + // Handle body attributes that doesn't play nicely with div elements + $regexp = '/<div class="' . preg_quote($body_id, '/') . '"([^>]*)/'; + if (preg_match($regexp, $body, $m)) { + $attrs = $m[0]; + // Get bgcolor, we'll set it as background-color of the message container + if ($m[1] && preg_match('/bgcolor=["\']*([a-z0-9#]+)["\']*/', $attrs, $mb)) { + $attributes['background-color'] = $mb[1]; + $attrs = preg_replace('/bgcolor=["\']*([a-z0-9#]+)["\']*/', '', $attrs); + } + // Get background, we'll set it as background-image of the message container + if ($m[1] && preg_match('/background=["\']*([^"\'>\s]+)["\']*/', $attrs, $mb)) { + $attributes['background-image'] = 'url('.$mb[1].')'; + $attrs = preg_replace('/background=["\']*([^"\'>\s]+)["\']*/', '', $attrs); + } + if (!empty($attributes)) { + $body = preg_replace($regexp, rtrim($attrs), $body, 1); + } - return $out; + // handle body styles related to background image + if ($attributes['background-image']) { + // get body style + if (preg_match('/#'.preg_quote($cont_id, '/').'\s+\{([^}]+)}/i', $body, $m)) { + // get background related style + if (preg_match_all('/(background-position|background-repeat)\s*:\s*([^;]+);/i', $m[1], $ma, PREG_SET_ORDER)) { + foreach ($ma as $style) + $attributes[$style[1]] = $style[2]; + } + } + } + } + // make sure there's 'rcmBody' div, we need it for proper css modification + // its name is hardcoded in rcmail_message_body() also + else { + $body = '<div class="' . $body_id . '">' . $body . '</div>'; } + return $body; +} + /** * parse link attributes and set correct target */ function rcmail_alter_html_link($matches) { - global $EMAIL_ADDRESS_PATTERN; - + global $RCMAIL; + + // Support unicode/punycode in top-level domain part + $EMAIL_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))'; + $tag = $matches[1]; $attrib = parse_attrib_string($matches[2]); $end = '>'; + // Remove non-printable characters in URL (#1487805) + $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']); + if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) { - $attrib['href'] = "./bin/modcss.php?u=" . urlencode($attrib['href']) . "&c=" . urlencode($GLOBALS['rcmail_html_container_id']); + $tempurl = 'tmp-' . md5($attrib['href']) . '.css'; + $_SESSION['modcssurls'][$tempurl] = $attrib['href']; + $attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id'])); $end = ' />'; } - else if (preg_match("/^mailto:$EMAIL_ADDRESS_PATTERN/i", $attrib['href'], $mailto)) { + else if (preg_match('/^mailto:'.$EMAIL_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) { $attrib['href'] = $mailto[0]; $attrib['onclick'] = sprintf( "return %s.command('compose','%s',this)", JS_OBJECT_NAME, - JQ($mailto[1])); + JQ($mailto[1].$mailto[3])); } else if (!empty($attrib['href']) && $attrib['href'][0] != '#') { $attrib['target'] = '_blank'; @@ -1165,7 +1235,7 @@ function rcmail_alter_html_link($matches) */ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null) { - global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $EMAIL_ADDRESS_PATTERN; + global $IMAP, $RCMAIL, $PRINT_MODE, $CONFIG; $a_parts = $IMAP->decode_address_list($input); @@ -1176,248 +1246,212 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null) $j = 0; $out = ''; + if ($addicon && !isset($_SESSION['writeable_abook'])) { + $_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false; + } + foreach ($a_parts as $part) { $j++; + + $name = $part['name']; + $mailto = $part['mailto']; + $string = $part['string']; + + // IDNA ASCII to Unicode + if ($name == $mailto) + $name = rcube_idn_to_utf8($name); + if ($string == $mailto) + $string = rcube_idn_to_utf8($string); + $mailto = rcube_idn_to_utf8($mailto); + if ($PRINT_MODE) { - $out .= sprintf('%s <%s>', Q($part['name']), $part['mailto']); + $out .= sprintf('%s <%s>', Q($name), $mailto); } - else if (preg_match("/$EMAIL_ADDRESS_PATTERN/i", $part['mailto'])) { + else if (check_email($part['mailto'], false)) { if ($linked) { - $out .= html::a(array( - 'href' => 'mailto:'.$part['mailto'], - 'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($part['mailto'])), - 'title' => $part['mailto'], + $address = html::a(array( + 'href' => 'mailto:'.$mailto, + 'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)), + 'title' => $mailto, 'class' => "rcmContactAddress", ), - Q($part['name'])); + Q($name ? $name : $mailto)); } else { - $out .= html::span(array('title' => $part['mailto'], 'class' => "rcmContactAddress"), Q($part['name'])); + $address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"), + Q($name ? $name : $mailto)); } - if ($addicon) { - $out .= ' ' . html::a(array( + if ($addicon && $_SESSION['writeable_abook']) { + $address = html::span(null, $address . html::a(array( 'href' => "#add", - 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($part['string'])), + 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)), 'title' => rcube_label('addtoaddressbook'), + 'class' => 'rcmaddcontact', ), html::img(array( 'src' => $CONFIG['skin_path'] . $addicon, 'alt' => "Add contact", - ))); + )))); } + $out .= $address; } else { - if ($part['name']) - $out .= Q($part['name']); - if ($part['mailto']) - $out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($part['mailto'])); + if ($name) + $out .= Q($name); + if ($mailto) + $out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($mailto)); } - + if ($c>$j) $out .= ','.($max ? ' ' : ' '); - + if ($max && $j==$max && $c>$j) { $out .= '...'; break; } } - + return $out; } /** * Wrap text to a given number of characters per line - * but respect the mail quotation of replies messages (>) + * but respect the mail quotation of replies messages (>). + * Finally add another quotation level by prpending the lines + * with > * * @param string Text to wrap * @param int The line width * @return string The wrapped text */ -function rcmail_wrap_quoted($text, $max = 76) +function rcmail_wrap_and_quote($text, $length = 72) { // Rebuild the message body with a maximum of $max chars, while keeping quoted message. + $max = min(77, $length + 8); $lines = preg_split('/\r?\n/', trim($text)); $out = ''; foreach ($lines as $line) { - if (strlen($line) > $max) { - if (preg_match('/^([>\s]+)/', $line, $regs)) { - $length = strlen($regs[0]); - $prefix = substr($line, 0, $length); - - // Remove '> ' from the line, then wordwrap() the line - $line = rc_wordwrap(substr($line, $length), $max - $length); - - // Rebuild the line with '> ' at the beginning of each 'subline' - $newline = ''; - foreach (explode("\n", $line) as $l) { - $newline .= $prefix . $l . "\n"; - } - - // Remove the righest newline char - $line = rtrim($newline); - } - else { - $line = rc_wordwrap($line, $max); + // don't wrap already quoted lines + if ($line[0] == '>') + $line = '>' . rtrim($line); + else if (mb_strlen($line) > $max) { + $newline = ''; + foreach(explode("\n", rc_wordwrap($line, $length - 2)) as $l) { + if (strlen($l)) + $newline .= '> ' . $l . "\n"; + else + $newline .= ">\n"; } + $line = rtrim($newline); } + else + $line = '> ' . $line; // Append the line $out .= $line . "\n"; } - + return $out; } +function rcmail_draftinfo_encode($p) +{ + $parts = array(); + foreach ($p as $key => $val) + $parts[] = $key . '=' . ($key == 'folder' ? base64_encode($val) : $val); + + return join('; ', $parts); +} + + +function rcmail_draftinfo_decode($str) +{ + $info = array(); + foreach (preg_split('/;\s+/', $str) as $part) { + list($key, $val) = explode('=', $part, 2); + if ($key == 'folder') + $val = base64_decode($val); + $info[$key] = $val; + } + + return $info; +} + + function rcmail_message_part_controls() - { +{ global $MESSAGE; - + $part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC)); if (!is_object($MESSAGE) || !is_array($MESSAGE->parts) || !($_GET['_uid'] && $_GET['_part']) || !$MESSAGE->mime_parts[$part]) return ''; - + $part = $MESSAGE->mime_parts[$part]; $table = new html_table(array('cols' => 3)); - + if (!empty($part->filename)) { $table->add('title', Q(rcube_label('filename'))); $table->add(null, Q($part->filename)); $table->add(null, '[' . html::a('?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q(rcube_label('download'))) . ']'); } - + if (!empty($part->size)) { $table->add('title', Q(rcube_label('filesize'))); $table->add(null, Q(show_bytes($part->size))); } - + return $table->show($attrib); - } +} function rcmail_message_part_frame($attrib) - { +{ global $MESSAGE; - + $part = $MESSAGE->mime_parts[asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))]; $ctype_primary = strtolower($part->ctype_primary); $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']); return html::iframe($attrib); - } +} /** * clear message composing settings */ -function rcmail_compose_cleanup() - { - if (!isset($_SESSION['compose'])) +function rcmail_compose_cleanup($id) +{ + if (!isset($_SESSION['compose_data_'.$id])) return; - rcmail::get_instance()->plugins->exec_hook('cleanup_attachments',array()); - - rcube_sess_unset('compose'); - } - - -/** - * Send the given message compose object using the configured method - */ -function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error) -{ - global $CONFIG, $RCMAIL; - - $msg_body = $message->get(); - $headers = $message->headers(); - - // send thru SMTP server using custom SMTP library - if ($CONFIG['smtp_server']) { - // generate list of recipients - $a_recipients = array($mailto); - - if (strlen($headers['Cc'])) - $a_recipients[] = $headers['Cc']; - if (strlen($headers['Bcc'])) - $a_recipients[] = $headers['Bcc']; - - // clean Bcc from header for recipients - $send_headers = $headers; - unset($send_headers['Bcc']); - // here too, it because txtHeaders() below use $message->_headers not only $send_headers - unset($message->_headers['Bcc']); - - // send message - if (!is_object($RCMAIL->smtp)) - $RCMAIL->smtp_init(true); - - $sent = $RCMAIL->smtp->send_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body); - $smtp_response = $RCMAIL->smtp->get_response(); - $smtp_error = $RCMAIL->smtp->get_error(); - - // log error - if (!$sent) - raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__, - 'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE); - } - // send mail using PHP's mail() function - else { - // unset some headers because they will be added by the mail() function - $headers_enc = $message->headers($headers); - $headers_php = $message->_headers; - unset($headers_php['To'], $headers_php['Subject']); - - // reset stored headers and overwrite - $message->_headers = array(); - $header_str = $message->txtHeaders($headers_php); - - // #1485779 - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) { - $headers_enc['To'] = implode(', ', $m[1]); - } - } - - if (ini_get('safe_mode')) - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str); - else - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from"); - } - - if ($sent) { - $RCMAIL->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body)); - - // remove MDN headers after sending - unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']); - - if ($CONFIG['smtp_log']) { - write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s", - $RCMAIL->user->get_username(), - $_SERVER['REMOTE_ADDR'], - $mailto, - !empty($smtp_response) ? join('; ', $smtp_response) : '')); - } - } - - $message->_headers = array(); - $message->headers($headers); - - return $sent; + $rcmail = rcmail::get_instance(); + $rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id)); + $rcmail->session->remove('compose_data_'.$id); } -function rcmail_send_mdn($uid, &$smtp_error) +/** + * Send the MDN response + * + * @param mixed $message Original message object (rcube_message) or UID + * @param array $smtp_error SMTP error array (reference) + * + * @return boolean Send status + */ +function rcmail_send_mdn($message, &$smtp_error) { global $RCMAIL, $IMAP; - $message = new rcube_message($uid); - - if ($message->headers->mdn_to && !$message->headers->mdn_sent && + if (!is_object($message) || !is_a($message, 'rcube_message')) + $message = new rcube_message($message); + + if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) && ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))) { $identity = $RCMAIL->user->get_identity(); @@ -1425,27 +1459,26 @@ function rcmail_send_mdn($uid, &$smtp_error) $recipient = array_shift($IMAP->decode_address_list($message->headers->mdn_to)); $mailto = $recipient['mailto']; - $compose = new rcube_mail_mime($RCMAIL->config->header_delimiter()); - $compose->setParam(array( - 'text_encoding' => 'quoted-printable', - 'html_encoding' => 'quoted-printable', - 'head_encoding' => 'quoted-printable', - 'head_charset' => RCMAIL_CHARSET, - 'html_charset' => RCMAIL_CHARSET, - 'text_charset' => RCMAIL_CHARSET, - )); - + $compose = new Mail_mime("\r\n"); + + $compose->setParam('text_encoding', 'quoted-printable'); + $compose->setParam('html_encoding', 'quoted-printable'); + $compose->setParam('head_encoding', 'quoted-printable'); + $compose->setParam('head_charset', RCMAIL_CHARSET); + $compose->setParam('html_charset', RCMAIL_CHARSET); + $compose->setParam('text_charset', RCMAIL_CHARSET); + // compose headers array $headers = array( - 'Date' => date('r'), + 'Date' => rcmail_user_date(), 'From' => $sender, 'To' => $message->headers->mdn_to, 'Subject' => rcube_label('receiptread') . ': ' . $message->subject, - 'Message-ID' => sprintf('<%s@%s>', md5(uniqid('rcmail'.mt_rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host'])), + 'Message-ID' => rcmail_gen_message_id(), 'X-Sender' => $identity['email'], - 'Content-Type' => 'multipart/report; report-type=disposition-notification', + 'References' => trim($message->headers->references . ' ' . $message->headers->messageID), ); - + if ($agent = $RCMAIL->config->get('useragent')) $headers['User-Agent'] = $agent; @@ -1454,22 +1487,23 @@ function rcmail_send_mdn($uid, &$smtp_error) "\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" . "\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" . "\r\n" . rcube_label("receiptnote") . "\r\n"; - - $ua = $RCMAIL->config->get('useragent', "RoundCube Webmail (Version ".RCMAIL_VERSION.")"); + + $ua = $RCMAIL->config->get('useragent', "Roundcube Webmail (Version ".RCMAIL_VERSION.")"); $report = "Reporting-UA: $ua\r\n"; - + if ($message->headers->to) $report .= "Original-Recipient: {$message->headers->to}\r\n"; - + $report .= "Final-Recipient: rfc822; {$identity['email']}\r\n" . "Original-Message-ID: {$message->headers->messageID}\r\n" . "Disposition: manual-action/MDN-sent-manually; displayed\r\n"; - + $compose->headers($headers); + $compose->setContentType('multipart/report', array('report-type'=> 'disposition-notification')); $compose->setTXTBody(rc_wordwrap($body, 75, "\r\n")); $compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline'); - $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error); + $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file); if ($sent) { @@ -1477,11 +1511,22 @@ function rcmail_send_mdn($uid, &$smtp_error) return true; } } - + return false; } +// Fixes some content-type names +function rcmail_fix_mimetype($name) +{ + // Some versions of Outlook create garbage Content-Type: + // application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608 + if (preg_match('/^application\/pdf.+/', $name)) + $name = 'application/pdf'; + + return $name; +} + function rcmail_search_filter($attrib) { global $OUTPUT, $CONFIG; @@ -1490,7 +1535,7 @@ function rcmail_search_filter($attrib) $attrib['id'] = 'rcmlistfilter'; $attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)'; - + /* RFC3501 (6.4.4): 'ALL', 'RECENT', 'ANSWERED', 'DELETED', 'FLAGGED', 'SEEN', @@ -1506,12 +1551,33 @@ function rcmail_search_filter($attrib) $select_filter->add(rcube_label('unanswered'), 'UNANSWERED'); if (!$CONFIG['skip_deleted']) $select_filter->add(rcube_label('deleted'), 'DELETED'); + $select_filter->add(rcube_label('priority').': '.rcube_label('highest'), 'HEADER X-PRIORITY 1'); + $select_filter->add(rcube_label('priority').': '.rcube_label('high'), 'HEADER X-PRIORITY 2'); + $select_filter->add(rcube_label('priority').': '.rcube_label('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5'); + $select_filter->add(rcube_label('priority').': '.rcube_label('low'), 'HEADER X-PRIORITY 4'); + $select_filter->add(rcube_label('priority').': '.rcube_label('lowest'), 'HEADER X-PRIORITY 5'); $out = $select_filter->show($_SESSION['search_filter']); $OUTPUT->add_gui_object('search_filter', $attrib['id']); - return $out; + return $out; +} + +function rcmail_message_error($uid=null) +{ + global $RCMAIL; + + // Set env variables for messageerror.html template + if ($RCMAIL->action == 'show') { + $mbox_name = $RCMAIL->imap->get_mailbox_name(); + $RCMAIL->output->set_env('mailbox', $mbox_name); + $RCMAIL->output->set_env('uid', null); + } + // display error message + $RCMAIL->output->show_message('messageopenerror', 'error'); + // ... display message error page + $RCMAIL->output->send('messageerror'); } // register UI objects @@ -1522,6 +1588,7 @@ $OUTPUT->add_handlers(array( 'quotadisplay' => 'rcmail_quota_display', 'mailboxname' => 'rcmail_mailbox_name_display', 'messageheaders' => 'rcmail_message_headers', + 'messagefullheaders' => 'rcmail_message_full_headers', 'messagebody' => 'rcmail_message_body', 'messagecontentframe' => 'rcmail_messagecontent_frame', 'messagepartframe' => 'rcmail_message_part_frame', @@ -1530,4 +1597,17 @@ $OUTPUT->add_handlers(array( 'searchform' => array($OUTPUT, 'search_form'), )); -?> +// register action aliases +$RCMAIL->register_action_map(array( + 'preview' => 'show.inc', + 'print' => 'show.inc', + 'moveto' => 'move_del.inc', + 'delete' => 'move_del.inc', + 'send' => 'sendmail.inc', + 'expunge' => 'folders.inc', + 'purge' => 'folders.inc', + 'remove-attachment' => 'attachments.inc', + 'display-attachment' => 'attachments.inc', + 'upload' => 'attachments.inc', + 'group-expand' => 'autocomplete.inc', +));