From 330a10b95294bcc082b880f30d9548891d63a1b0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Jun 2010 06:15:41 -0400
Subject: [PATCH] - remove debug code
---
program/steps/mail/func.inc | 396 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 241 insertions(+), 155 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 7f67b29..a63b509 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -27,7 +27,7 @@
$EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-z]{2,5})';
// actions that do not require imap connection
-$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');
+$NOIMAP_ACTIONS = array('addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');
// always instantiate imap object (but not yet connect to server)
$RCMAIL->imap_init();
@@ -88,19 +88,16 @@
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();
$OUTPUT->set_env('search_request', $search_request);
}
-
+
$search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
$OUTPUT->set_env('search_mods', $search_mods);
-
- // make sure the message count is refreshed (for default view)
- $IMAP->messagecount($mbox_name, $IMAP->threading ? 'THREADS' : 'ALL', true);
}
-
+
// set current mailbox and some other vars in client environment
$OUTPUT->set_env('mailbox', $mbox_name);
$OUTPUT->set_env('pagesize', $IMAP->page_size);
@@ -154,15 +151,18 @@
$attrib['id'] = 'rcubemessagelist';
// 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;
+ }
// save some variables for use in ajax list
- $_SESSION['list_columns'] = $a_show_cols;
$_SESSION['list_attrib'] = $attrib;
-
+
$mbox = $IMAP->get_mailbox_name();
$delim = $IMAP->get_hierarchy_delimiter();
@@ -171,19 +171,18 @@
&& (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
$a_show_cols[$f] = 'to';
+ // make sure 'threads' column is present
+ if (!in_array('threads', $a_show_cols))
+ array_unshift($a_show_cols, 'threads');
+
$skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path'];
- $message_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
-
+
// set client env
- $OUTPUT->add_gui_object('mailcontframe', 'mailcontframe');
$OUTPUT->add_gui_object('messagelist', $attrib['id']);
$OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads']));
- $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', $_SESSION['sort_col']);
$OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
-
+
if ($attrib['messageicon'])
$OUTPUT->set_env('messageicon', $skin_path . $attrib['messageicon']);
if ($attrib['deletedicon'])
@@ -204,24 +203,21 @@
$OUTPUT->set_env('unflaggedicon', $skin_path . $attrib['unflaggedicon']);
if ($attrib['unreadchildrenicon'])
$OUTPUT->set_env('unreadchildrenicon', $skin_path . $attrib['unreadchildrenicon']);
-
+
$OUTPUT->set_env('messages', array());
$OUTPUT->set_env('coltypes', $a_show_cols);
-
- if (!$message_count)
- $OUTPUT->show_message('nomessagesfound', 'notice');
-
+
$OUTPUT->include_script('list.js');
-
+
$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'));
+ array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
}
@@ -229,47 +225,58 @@
* 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, $head_replace=FALSE)
+function rcmail_js_message_list($a_headers, $insert_top=FALSE, $head_replace=FALSE)
{
- global $CONFIG, $IMAP, $OUTPUT;
+ global $CONFIG, $IMAP, $RCMAIL, $OUTPUT;
- if (empty($_SESSION['list_columns']))
- $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
+ if (!empty($_SESSION['list_attrib']['columns']))
+ $a_show_cols = $_SESSION['list_attrib']['columns'];
else
- $a_show_cols = $_SESSION['list_columns'];
+ $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
$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)) !== false) && array_search('to', $a_show_cols) === false)
$a_show_cols[$f] = 'to';
+ // make sure 'threads' column is present
+ if (!in_array('threads', $a_show_cols))
+ array_unshift($a_show_cols, 'threads');
+
+ // 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));
+
+ $a_show_cols = $plugin['cols'];
+ $a_headers = $plugin['messages'];
+
$thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
-
+
$OUTPUT->command('set_message_coltypes', $a_show_cols, $thead);
if (empty($a_headers))
return;
- // remove 'attachment' and 'flag' columns, we don't need them here
- if(($key = array_search('attachment', $a_show_cols)) !== FALSE)
+ // remove 'threads', 'attachment', '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)
+ if (($key = array_search('flag', $a_show_cols)) !== FALSE)
unset($a_show_cols[$key]);
-
- if ($OUTPUT->browser->ie && $replace)
- $OUTPUT->command('offline_message_list', true);
-
+ if (($key = array_search('threads', $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();
-
if (empty($header))
continue;
+
+ $a_msg_cols = array();
+ $a_msg_flags = array();
$IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);
@@ -290,12 +297,14 @@
$cont = format_date($header->date);
else
$cont = Q($header->$col);
-
+
$a_msg_cols[$col] = $cont;
}
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)
@@ -316,6 +325,12 @@
$a_msg_flags['attachment'] = 1;
$a_msg_flags['mbox'] = $mbox;
+ // merge with plugin result
+ 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);
+
$OUTPUT->command('add_message_row',
$header->uid,
$a_msg_cols,
@@ -323,9 +338,10 @@
$insert_top);
}
- if ($browser->ie && $replace)
- $OUTPUT->command('offline_message_list', false);
- }
+ if ($IMAP->threading) {
+ $OUTPUT->command('init_threads', (array) $roots);
+ }
+}
/*
@@ -344,7 +360,7 @@
// define sortable columns
$a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');
-
+
if (!empty($attrib['optionsmenuicon']))
$list_menu = html::a(
array('href' => '#', 'onclick' => 'return '.JS_OBJECT_NAME.".command('menu-open', 'messagelistmenu')"),
@@ -353,7 +369,7 @@
else
$list_menu = '';
- $cells = array(array('className' => 'threads', 'html' => $list_menu));
+ $cells = array();
foreach ($a_show_cols as $col) {
// get column name
@@ -363,6 +379,9 @@
break;
case 'attachment':
$col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '');
+ break;
+ case 'threads':
+ $col_name = $list_menu;
break;
default:
$col_name = Q(rcube_label($col));
@@ -389,7 +408,7 @@
function rcmail_messagecontent_frame($attrib)
{
global $OUTPUT;
-
+
if (empty($attrib['id']))
$attrib['id'] = 'rcmailcontentwindow';
@@ -405,7 +424,7 @@
function rcmail_messagecount_display($attrib)
{
global $IMAP, $OUTPUT;
-
+
if (!$attrib['id'])
$attrib['id'] = 'rcmcountdisplay';
@@ -426,15 +445,15 @@
$_SESSION['quota_display'] = $attrib['display'];
$OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
-
+
$quota = rcmail_quota_content($attrib);
-
+
if (is_array($quota)) {
$OUTPUT->add_script('$(document).ready(function(){
rcmail.set_quota('.json_serialize($quota).')});', 'foot');
$quota = '';
}
-
+
return html::span($attrib, $quota);
}
@@ -448,14 +467,14 @@
$quota = $RCMAIL->imap->get_quota();
$quota = $RCMAIL->plugins->exec_hook('quota', $quota);
- if (!isset($quota['used']) || !isset($quota['total']))
- return rcube_label('unknown');
+ if (!$quota['total'] && $RCMAIL->config->get('quota_zero_as_unlimited'))
+ return rcube_label('unlimited');
- if (!($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
+ if ($quota['total'])
{
if (!isset($quota['percent']))
$quota['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
-
+
$quota_result = sprintf('%s / %s (%.0f%%)',
show_bytes($quota['used'] * 1024), show_bytes($quota['total'] * 1024),
$quota['percent']);
@@ -464,25 +483,25 @@
$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');
- return $quota_result;
+ return $quota_result;
+ }
+
+ return rcube_label('unknown');
}
function rcmail_get_messagecount_text($count=NULL, $page=NULL)
{
- global $IMAP, $MESSAGE;
-
+ global $RCMAIL, $IMAP, $MESSAGE;
+
if (isset($MESSAGE->index))
{
return rcube_label(array('name' => 'messagenrof',
@@ -492,9 +511,13 @@
if ($page===NULL)
$page = $IMAP->list_page;
-
+
$start_msg = ($page-1) * $IMAP->page_size + 1;
- $max = $count!==NULL ? $count : $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
+
+ if ($count!==NULL)
+ $max = $count;
+ else if ($RCMAIL->action)
+ $max = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
if ($max==0)
$out = rcube_label('mailboxempty');
@@ -528,19 +551,23 @@
}
-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);
+
+ 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;
-
+
return $unseen;
}
@@ -639,7 +666,7 @@
$wash_opts['html_elements'][] = 'link';
$wash_opts['html_attribs'] = array('rel','type');
}
-
+
$washer = new washtml($wash_opts);
$washer->add_callback('form', 'rcmail_washtml_callback');
@@ -664,7 +691,7 @@
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));
@@ -691,7 +718,7 @@
$body = $part->body;
$part->ctype_secondary = $data['type'] = 'plain';
}
-
+
// free some memory (hopefully)
unset($data['body']);
@@ -716,7 +743,7 @@
{
// make links and email-addresses clickable
$replacements = 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);
@@ -790,21 +817,21 @@
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));
-
+
// 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);
break;
}
-
+
default:
$out = '';
}
-
+
return $out;
}
@@ -832,13 +859,13 @@
{
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;
@@ -872,15 +899,15 @@
$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]);
}
-
+
$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')));
@@ -910,13 +937,13 @@
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))
@@ -936,6 +963,15 @@
// fetch part if not available
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);
+ }
+
+ // re-format format=flowed content
+ if ($part->ctype_secondary == "plain" && $part->ctype_parameters['format'] == "flowed")
+ $part->body = rcube_message::unfold_flowed($part->body);
$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));
@@ -970,7 +1006,7 @@
}
}
}
-
+
// tell client that there are blocked remote objects
if ($REMOTE_OBJECTS && !$safe_mode)
$OUTPUT->set_env('blockedobjects', true);
@@ -1003,7 +1039,7 @@
{
$last_style_pos = 0;
$body_lc = strtolower($body);
-
+
// find STYLE tags
while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos)))
{
@@ -1066,13 +1102,14 @@
function rcmail_alter_html_link($matches)
{
global $EMAIL_ADDRESS_PATTERN;
-
+
$tag = $matches[1];
$attrib = parse_attrib_string($matches[2]);
$end = '>';
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']);
+ $attrib['href'] = "?_task=utils&_action=modcss&u=" . urlencode($attrib['href'])
+ . "&c=" . urlencode($GLOBALS['rcmail_html_container_id']);
$end = ' />';
}
else if (preg_match('/^mailto:'.$EMAIL_ADDRESS_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) {
@@ -1148,61 +1185,58 @@
if ($part['mailto'])
$out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($part['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);
+ // 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";
}
- else {
- $line = rc_wordwrap($line, $max);
- }
+ $line = rtrim($newline);
}
+ else
+ $line = '> ' . $line;
// Append the line
$out .= $line . "\n";
}
-
+
return $out;
}
@@ -1212,7 +1246,7 @@
$parts = array();
foreach ($p as $key => $val)
$parts[] = $key . '=' . ($key == 'folder' ? base64_encode($val) : $val);
-
+
return join('; ', $parts);
}
@@ -1226,7 +1260,7 @@
$val = base64_decode($val);
$info[$key] = $val;
}
-
+
return $info;
}
@@ -1234,25 +1268,25 @@
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);
}
@@ -1261,7 +1295,7 @@
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);
@@ -1283,7 +1317,7 @@
$rcmail->plugins->exec_hook('cleanup_attachments',array());
$rcmail->session->remove('compose');
}
-
+
/**
* Send the given message using the configured method
@@ -1306,12 +1340,12 @@
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']);
@@ -1339,7 +1373,7 @@
// send message
if (!is_object($RCMAIL->smtp))
$RCMAIL->smtp_init(true);
-
+
$sent = $RCMAIL->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body);
$smtp_response = $RCMAIL->smtp->get_response();
$smtp_error = $RCMAIL->smtp->get_error();
@@ -1359,18 +1393,18 @@
$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]);
- }
}
-
+ }
+
$msg_body = $message->get();
if (PEAR::isError($msg_body))
@@ -1378,18 +1412,31 @@
'file' => __FILE__, 'line' => __LINE__,
'message' => "Could not create message: ".$msg_body->getMessage()),
TRUE, FALSE);
- else 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");
+ else {
+ $delim = $RCMAIL->config->header_delimiter();
+ $to = $headers_enc['To'];
+ $subject = $headers_enc['Subject'];
+
+ if ($delim != "\r\n") {
+ $header_str = str_replace("\r\n", $delim, $header_str);
+ $msg_body = str_replace("\r\n", $delim, $msg_body);
+ $to = str_replace("\r\n", $delim, $to);
+ $subject = str_replace("\r\n", $delim, $subject);
+ }
+
+ if (ini_get('safe_mode'))
+ $sent = mail($to, $subject, $msg_body, $header_str);
+ else
+ $sent = mail($to, $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(),
@@ -1401,7 +1448,7 @@
$message->_headers = array();
$message->headers($headers);
-
+
return $sent;
}
@@ -1411,7 +1458,7 @@
global $RCMAIL, $IMAP;
$message = new rcube_message($uid);
-
+
if ($message->headers->mdn_to && !$message->headers->mdn_sent &&
($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')))
{
@@ -1420,7 +1467,7 @@
$recipient = array_shift($IMAP->decode_address_list($message->headers->mdn_to));
$mailto = $recipient['mailto'];
- $compose = new Mail_mime($RCMAIL->config->header_delimiter());
+ $compose = new Mail_mime("\r\n");
$compose->setParam('text_encoding', 'quoted-printable');
$compose->setParam('html_encoding', 'quoted-printable');
@@ -1428,18 +1475,18 @@
$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'])),
'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;
@@ -1448,18 +1495,19 @@
"\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.")");
$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');
@@ -1471,9 +1519,32 @@
return true;
}
}
-
+
return false;
}
+
+// Returns RFC2822 formatted current date in user's timezone
+function rcmail_user_date()
+{
+ global $CONFIG;
+
+ // get user's timezone
+ if ($CONFIG['timezone'] === 'auto') {
+ $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
+ }
+ else {
+ $tz = $CONFIG['timezone'];
+ if ($CONFIG['dst_active'])
+ $tz++;
+ }
+
+ $date = time() + $tz * 60 * 60;
+ $date = gmdate('r', $date);
+ $date = preg_replace('/[+-][0-9]{4}$/', sprintf('%+05d', $tz * 100), $date);
+
+ return $date;
+}
+
function rcmail_search_filter($attrib)
{
@@ -1483,7 +1554,7 @@
$attrib['id'] = 'rcmlistfilter';
$attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)';
-
+
/*
RFC3501 (6.4.4): 'ALL', 'RECENT',
'ANSWERED', 'DELETED', 'FLAGGED', 'SEEN',
@@ -1504,9 +1575,24 @@
$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
$OUTPUT->add_handlers(array(
--
Gitblit v1.9.1