From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations
---
program/steps/mail/func.inc | 542 ++++++++++++++++++++++++-----------------------------
1 files changed, 247 insertions(+), 295 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index fd0d2c2..9bda890 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -79,6 +79,7 @@
// add some labels to client
rcube_add_label('purgefolderconfirm');
+ rcube_add_label('deletemessagesconfirm');
// $mboxlist_start = rcube_timer();
@@ -214,6 +215,7 @@
else if ($folder['id']==$CONFIG['junk_mbox'])
$class_name = 'junk';
+ $js_name = htmlspecialchars(rep_specialchars_output($folder['id'], 'js'));
$out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="%s&_mbox=%s"'.
' onclick="return %s.command(\'list\',\'%s\')"'.
' onmouseover="return %s.focus_mailbox(\'%s\')"' .
@@ -223,17 +225,17 @@
$class_name,
$zebra_class,
$unread_count ? ' unread' : '',
- addslashes($folder['id'])==addslashes($mbox_name) ? ' selected' : '',
+ $folder['id']==$mbox_name ? ' selected' : '',
$COMM_PATH,
urlencode($folder['id']),
$JS_OBJECT_NAME,
- addslashes($folder['id']),
+ $js_name,
$JS_OBJECT_NAME,
- addslashes($folder['id']),
+ $js_name,
$JS_OBJECT_NAME,
- addslashes($folder['id']),
+ $js_name,
$JS_OBJECT_NAME,
- addslashes($folder['id']),
+ $js_name,
$title,
rep_specialchars_output($foldername, 'html', 'all'));
@@ -270,7 +272,7 @@
}
$out .= sprintf('<option value="%s">%s%s</option>'."\n",
- $folder['id'],
+ htmlspecialchars($folder['id']),
str_repeat(' ', $nestLevel*4),
rep_specialchars_output($foldername, 'html', 'all'));
@@ -426,7 +428,7 @@
$message_icon = $attrib['messageicon'];
// set attachment icon
- if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype))
+ if ($attrib['attachmenticon'] && preg_match("/multipart\/[mr]/i", $header->ctype))
$attach_icon = $attrib['attachmenticon'];
$out .= sprintf('<tr id="rcmrow%d" class="message%s%s %s">'."\n",
@@ -494,6 +496,7 @@
$javascript .= sprintf("%s.set_env('messages', %s);", $JS_OBJECT_NAME, array2js($a_js_message_arr));
$OUTPUT->add_script($javascript);
+ $OUTPUT->include_script('list.js');
return $out;
}
@@ -510,8 +513,8 @@
$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
// show 'to' instead of from in sent messages
- if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
- && !array_search('to', $a_show_cols))
+ if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox'])
+ && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols))
$a_show_cols[$f] = 'to';
$commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols));
@@ -527,7 +530,7 @@
foreach ($a_show_cols as $col)
{
if ($col=='from' || $col=='to')
- $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3));
+ $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3), 'html');
else if ($col=='subject')
$cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all');
else if ($col=='size')
@@ -554,6 +557,27 @@
return $commands;
}
+
+// return an HTML iframe for loading mail content
+function rcmail_messagecontent_frame($attrib)
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+
+ if (empty($attrib['id']))
+ $attrib['id'] = 'rcmailcontentwindow';
+
+ // allow the following attributes to be added to the <iframe> tag
+ $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder'));
+ $framename = $attrib['id'];
+
+ $out = sprintf('<iframe name="%s"%s></iframe>'."\n",
+ $framename,
+ $attrib_str);
+
+ $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');");
+
+ return $out;
+ }
// return code for search function
function rcmail_search_form($attrib)
@@ -610,7 +634,7 @@
function rcmail_quota_display($attrib)
{
- global $IMAP, $OUTPUT, $JS_OBJECT_NAME;
+ global $IMAP, $OUTPUT, $JS_OBJECT_NAME, $COMM_PATH;
if (!$attrib['id'])
$attrib['id'] = 'rcmquotadisplay';
@@ -619,11 +643,33 @@
// allow the following attributes to be added to the <span> tag
$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
-
+
if (!$IMAP->get_capability('QUOTA'))
$quota_text = rcube_label('unknown');
- else if (!($quota_text = $IMAP->get_quota()))
+ else if ($quota = $IMAP->get_quota())
+ {
+ $quota_text = sprintf("%s / %s (%.0f%%)",
+ show_bytes($quota["used"] * 1024),
+ show_bytes($quota["total"] * 1024),
+ $quota["percent"]);
+
+ // show quota as image (by Brett Patterson)
+ if ($attrib['display'] == 'image' && function_exists('imagegif'))
+ {
+ $attrib += array('width' => 100, 'height' => 14);
+ $quota_text = sprintf('<img src="%s&_action=quotaimg&u=%s&q=%d&w=%d&h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
+ $COMM_PATH,
+ $quota['used'], $quota['total'],
+ $attrib['width'], $attrib['height'],
+ $attrib['width'], $attrib['height'],
+ $quota_text,
+ show_bytes($quota["used"] * 1024),
+ show_bytes($quota["total"] * 1024));
+ }
+ }
+ else
$quota_text = rcube_label('unlimited');
+
$out = '<span' . $attrib_str . '>';
$out .= $quota_text;
@@ -661,34 +707,32 @@
}
-function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_primary='text', $ctype_secondary='plain', $encoding='7bit', $safe=FALSE, $plain=FALSE)
+function rcmail_print_body($part, $safe=FALSE, $plain=FALSE)
{
global $IMAP, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
-
- // extract part properties: body, ctype_primary, ctype_secondary, encoding, parameters
- extract($part);
- $block = $plain ? '%s' : '%s'; //'<div style="display:block;">%s</div>';
- $body = $IMAP->mime_decode($body, $encoding);
- $body = $IMAP->charset_decode($body, $parameters);
+ $body = is_array($part->replaces) ? strtr($part->body, $part->replaces) : $part->body;
// text/html
- if ($ctype_secondary=='html')
+ if ($part->ctype_secondary=='html')
{
+ // remove charset specification in HTML message
+ $body = preg_replace('/charset=[a-z0-9\-]+/i', '', $body);
+
if (!$safe) // remove remote images and scripts
{
- $remote_patterns = array('/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
- // '/(src|background)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Ui',
+ $remote_patterns = array('/<img\s+(.*)src=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
+ '/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
'/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
'/(<link.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
'/url\s*\(["\']?([hftps]{3,5}:\/{2}[^"\'\s]+)["\']?\)/i',
'/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i',
'/<script.+<\/script>/Umis');
- $remote_replaces = array('', // '\\1=\\2#\\4',
- // '\\1=\\2#\\4',
+ $remote_replaces = array('<img \\1src=\\2./program/blank.gif\\4',
'',
- '', // '\\1#\\3',
+ '',
+ '',
'none',
'none',
'');
@@ -706,21 +750,20 @@
$body = preg_replace($remote_patterns, $remote_replaces, $body);
}
- return sprintf($block, rep_specialchars_output($body, 'html', '', FALSE));
+ return rep_specialchars_output($body, 'html', '', FALSE);
}
// text/enriched
- if ($ctype_secondary=='enriched')
+ if ($part->ctype_secondary=='enriched')
{
- $body = enriched_to_html($body);
- return sprintf($block, rep_specialchars_output($body, 'html'));
+ return rep_specialchars_output(enriched_to_html($body), 'html');
}
else
{
// make links and email-addresses clickable
$convert_patterns = $convert_replaces = $replace_strings = array();
- $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:';
+ $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;';
$url_chars_within = '\?\.~,!';
$convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
@@ -731,39 +774,44 @@
$convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie';
$convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";
+
+ if ($part->ctype_parameters['format'] != 'flowed')
+ $body = wordwrap(trim($body), 80);
- $body = wordwrap(trim($body), 80);
$body = preg_replace($convert_patterns, $convert_replaces, $body);
// split body into single lines
$a_lines = preg_split('/\r?\n/', $body);
+ $quote_level = 0;
// colorize quoted parts
for($n=0; $n<sizeof($a_lines); $n++)
{
$line = $a_lines[$n];
+ $quotation = '';
+ $q = 0;
+
+ if (preg_match('/^(>+\s*)/', $line, $regs))
+ {
+ $q = strlen(preg_replace('/\s/', '', $regs[1]));
+ $line = substr($line, strlen($regs[1]));
- if ($line{2}=='>')
- $color = 'red';
- else if ($line{1}=='>')
- $color = 'green';
- else if ($line{0}=='>')
- $color = 'blue';
- else
- $color = FALSE;
+ if ($q > $quote_level)
+ $quotation = str_repeat('<blockquote>', $q - $quote_level);
+ else if ($q < $quote_level)
+ $quotation = str_repeat("</blockquote>", $quote_level - $q);
+ }
+ else if ($quote_level > 0)
+ $quotation = str_repeat("</blockquote>", $quote_level);
- $line = rep_specialchars_output($line, 'html', 'replace', FALSE);
-
- if ($color)
- $a_lines[$n] = sprintf('<font color="%s">%s</font>', $color, $line);
- else
- $a_lines[$n] = $line;
+ $quote_level = $q;
+ $a_lines[$n] = $quotation . rep_specialchars_output($line, 'html', 'replace', FALSE);
}
// insert the links for urls and mailtos
$body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));
- return sprintf($block, "<pre>\n".$body."\n</pre>");
+ return "<div class=\"pre\">".$body."\n</div>";
}
}
@@ -778,7 +826,7 @@
}
-function rcmail_parse_message($structure, $arg=array(), $recursive=FALSE)
+function rcmail_parse_message(&$structure, $arg=array(), $recursive=FALSE)
{
global $IMAP;
static $sa_inline_objects = array();
@@ -795,18 +843,18 @@
// show message headers
if ($recursive && is_array($structure->headers) && isset($structure->headers['subject']))
- $a_return_parts[] = array('type' => 'headers',
- 'headers' => $structure->headers);
+ {
+ $c = new stdClass;
+ $c->type = 'headers';
+ $c->headers = &$structure->headers;
+ $a_return_parts[] = $c;
+ }
// print body if message doesn't have multiple parts
if ($message_ctype_primary=='text')
{
- $a_return_parts[] = array('type' => 'content',
- 'body' => $structure->body,
- 'ctype_primary' => $message_ctype_primary,
- 'ctype_secondary' => $message_ctype_secondary,
- 'parameters' => $structure->ctype_parameters,
- 'encoding' => $structure->headers['content-transfer-encoding']);
+ $structure->type = 'content';
+ $a_return_parts[] = &$structure;
}
// message contains alternative parts
@@ -841,49 +889,52 @@
// print html/plain part
else if ($html_part!==NULL && $prefer_html)
- $print_part = $structure->parts[$html_part];
+ $print_part = &$structure->parts[$html_part];
else if ($enriched_part!==NULL)
- $print_part = $structure->parts[$enriched_part];
+ $print_part = &$structure->parts[$enriched_part];
else if ($plain_part!==NULL)
- $print_part = $structure->parts[$plain_part];
+ $print_part = &$structure->parts[$plain_part];
// show message body
if (is_object($print_part))
- $a_return_parts[] = array('type' => 'content',
- 'body' => $print_part->body,
- 'ctype_primary' => strtolower($print_part->ctype_primary),
- 'ctype_secondary' => strtolower($print_part->ctype_secondary),
- 'parameters' => $print_part->ctype_parameters,
- 'encoding' => $print_part->headers['content-transfer-encoding']);
+ {
+ $print_part->type = 'content';
+ $a_return_parts[] = $print_part;
+ }
// show plaintext warning
else if ($html_part!==NULL)
- $a_return_parts[] = array('type' => 'content',
- 'body' => rcube_label('htmlmessage'),
- 'ctype_primary' => 'text',
- 'ctype_secondary' => 'plain');
+ {
+ $c = new stdClass;
+ $c->type = 'content';
+ $c->body = rcube_label('htmlmessage');
+ $c->ctype_primary = 'text';
+ $c->ctype_secondary = 'plain';
+
+ $a_return_parts[] = $c;
+ }
// add html part as attachment
if ($html_part!==NULL && $structure->parts[$html_part]!==$print_part)
{
- $html_part = $structure->parts[$html_part];
- $a_attachments[] = array('filename' => rcube_label('htmlmessage'),
- 'encoding' => $html_part->headers['content-transfer-encoding'],
- 'mimetype' => 'text/html',
- 'part_id' => $html_part->mime_id,
- 'size' => strlen($IMAP->mime_decode($html_part->body, $html_part->headers['content-transfer-encoding'])));
+ $html_part = &$structure->parts[$html_part];
+ $html_part->filename = rcube_label('htmlmessage');
+ $html_part->mimetype = 'text/html';
+
+ $a_attachments[] = $html_part;
}
}
// message contains multiple parts
- else if ($message_ctype_primary=='multipart' && is_array($structure->parts))
+ else if (is_array($structure->parts) && !empty($structure->parts))
{
- foreach ($structure->parts as $mail_part)
+ for ($i=0; $i<count($structure->parts); $i++)
{
+ $mail_part = &$structure->parts[$i];
$primary_type = strtolower($mail_part->ctype_primary);
$secondary_type = strtolower($mail_part->ctype_secondary);
// multipart/alternative
- if ($primary_type=='multipart') // && ($secondary_type=='alternative' || $secondary_type=='mixed' || $secondary_type=='related'))
+ if ($primary_type=='multipart')
{
list($parts, $attachmnts) = rcmail_parse_message($mail_part, $arg, TRUE);
@@ -895,25 +946,15 @@
else if (($primary_type=='text' && ($secondary_type=='plain' || $secondary_type=='html') && $mail_part->disposition!='attachment') ||
($primary_type=='message' && $secondary_type=='delivery-status'))
{
- $a_return_parts[] = array('type' => 'content',
- 'body' => $mail_part->body,
- 'ctype_primary' => $primary_type,
- 'ctype_secondary' => $secondary_type,
- 'parameters' => $mail_part->ctype_parameters,
- 'encoding' => $mail_part->headers['content-transfer-encoding']);
+ $mail_part->type = 'content';
+ $a_return_parts[] = $mail_part;
}
// part message/*
else if ($primary_type=='message')
{
- /* don't parse headers here; they're parsed within the recursive call to rcmail_parse_message()
- if ($mail_part->parts[0]->headers)
- $a_return_parts[] = array('type' => 'headers',
- 'headers' => $mail_part->parts[0]->headers);
- */
-
- list($parts, $attachmnts) = rcmail_parse_message($mail_part->parts[0], $arg, TRUE);
-
+ list($parts, $attachmnts) = rcmail_parse_message($mail_part, $arg, TRUE);
+
$a_return_parts = array_merge($a_return_parts, $parts);
$a_attachments = array_merge($a_attachments, $attachmnts);
}
@@ -922,35 +963,25 @@
else if ($mail_part->disposition=='attachment' || $mail_part->disposition=='inline' || $mail_part->headers['content-id'] ||
(empty($mail_part->disposition) && ($mail_part->d_parameters['filename'] || $mail_part->ctype_parameters['name'])))
{
- if ($message_ctype_secondary=='related' && $mail_part->headers['content-id'])
- $sa_inline_objects[] = array('filename' => rcube_imap::decode_mime_string($mail_part->d_parameters['filename']),
- 'mimetype' => strtolower("$primary_type/$secondary_type"),
- 'part_id' => $mail_part->mime_id,
- 'content_id' => preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']));
+ // skip apple ressource files
+ if ($message_ctype_secondary=='appledouble' && $secondary_type=='applefile')
+ continue;
- else if ($mail_part->d_parameters['filename'])
- $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->d_parameters['filename']),
- 'encoding' => strtolower($mail_part->headers['content-transfer-encoding']),
- 'mimetype' => strtolower("$primary_type/$secondary_type"),
- 'part_id' => $mail_part->mime_id,
- 'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
- 'content' => $mail_part->body */);
-
- else if ($mail_part->ctype_parameters['name'])
- $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->ctype_parameters['name']),
- 'encoding' => strtolower($mail_part->headers['content-transfer-encoding']),
- 'mimetype' => strtolower("$primary_type/$secondary_type"),
- 'part_id' => $mail_part->mime_id,
- 'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
- 'content' => $mail_part->body */);
-
- else if ($mail_part->headers['content-description'])
- $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->headers['content-description']),
- 'encoding' => strtolower($mail_part->headers['content-transfer-encoding']),
- 'mimetype' => strtolower("$primary_type/$secondary_type"),
- 'part_id' => $mail_part->mime_id,
- 'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
- 'content' => $mail_part->body */);
+ // part belongs to a related message
+ if ($message_ctype_secondary=='related' && $mail_part->headers['content-id'])
+ {
+ $mail_part->filename = rcube_imap::decode_mime_string($mail_part->d_parameters['filename']);
+ $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
+ $sa_inline_objects[] = $mail_part;
+ }
+ // is regular attachment
+ else if (($fname = $mail_part->d_parameters['filename']) ||
+ ($fname = $mail_part->ctype_parameters['name']) ||
+ ($fname = $mail_part->headers['content-description']))
+ {
+ $mail_part->filename = rcube_imap::decode_mime_string($fname);
+ $a_attachments[] = $mail_part;
+ }
}
}
@@ -958,30 +989,20 @@
// if this was a related part try to resolve references
if ($message_ctype_secondary=='related' && sizeof($sa_inline_objects))
{
- $a_replace_patters = array();
- $a_replace_strings = array();
+ $a_replaces = array();
foreach ($sa_inline_objects as $inline_object)
- {
- $a_replace_patters[] = 'cid:'.$inline_object['content_id'];
- $a_replace_strings[] = sprintf($get_url, $inline_object['part_id']);
- }
+ $a_replaces['cid:'.$inline_object->content_id] = htmlspecialchars(sprintf($get_url, $inline_object->mime_id));
- foreach ($a_return_parts as $i => $return_part)
+ // add replace array to each content part
+ // (will be applied later when part body is available)
+ for ($i=0; $i<count($a_return_parts); $i++)
{
- if ($return_part['type']!='content')
- continue;
-
- // decode body and replace cid:...
- $a_return_parts[$i]['body'] = str_replace($a_replace_patters, $a_replace_strings, $IMAP->mime_decode($return_part['body'], $return_part['encoding']));
- $a_return_parts[$i]['encoding'] = '7bit';
+ if ($a_return_parts[$i]->type=='content')
+ $a_return_parts[$i]->replaces = $a_replaces;
}
}
}
-
-
- // join all parts together
- //$out .= join($part_delimiter, $a_return_parts);
return array($a_return_parts, $a_attachments);
}
@@ -1045,7 +1066,7 @@
function rcmail_message_body($attrib)
{
- global $CONFIG, $OUTPUT, $MESSAGE, $GET_URL, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
+ global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $GET_URL, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
if (!is_array($MESSAGE['parts']) && !$MESSAGE['body'])
return '';
@@ -1067,28 +1088,33 @@
// -> create a plaintext body with the according message
if (!sizeof($MESSAGE['parts']) && $MESSAGE['headers']->ctype=='multipart/encrypted')
{
- $MESSAGE['parts'][0] = array('type' => 'content',
- 'ctype_primary' => 'text',
- 'ctype_secondary' => 'plain',
- 'body' => rcube_label('encryptedmessage'));
+ $p = new stdClass;
+ $p->type = 'content';
+ $p->ctype_primary = 'text';
+ $p->ctype_secondary = 'plain';
+ $p->body = rcube_label('encryptedmessage');
+ $MESSAGE['parts'][0] = $p;
}
if ($MESSAGE['parts'])
{
foreach ($MESSAGE['parts'] as $i => $part)
{
- if ($part['type']=='headers')
- $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part['headers']);
- else if ($part['type']=='content')
+ if ($part->type=='headers')
+ $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
+ else if ($part->type=='content')
{
- if (empty($part['parameters']) || empty($part['parameters']['charset']))
- $part['parameters']['charset'] = $MESSAGE['headers']->charset;
-
- // $body = rcmail_print_body($part['body'], $part['ctype_primary'], $part['ctype_secondary'], $part['encoding'], $safe_mode);
+ if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset']))
+ $part->ctype_parameters['charset'] = $MESSAGE['headers']->charset;
+
+ // fetch part if not available
+ if (!isset($part->body))
+ $part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);
+
$body = rcmail_print_body($part, $safe_mode);
$out .= '<div class="message-part">';
- if ($part['ctype_secondary']!='plain')
+ if ($part->ctype_secondary != 'plain')
$out .= rcmail_mod_html_body($body, $attrib['id']);
else
$out .= $body;
@@ -1110,11 +1136,11 @@
{
foreach ($MESSAGE['attachments'] as $attach_prop)
{
- if (strpos($attach_prop['mimetype'], 'image/')===0)
- $out .= sprintf("\n<hr />\n<p align=\"center\"><img src=\"%s&_part=%s\" alt=\"%s\" title=\"%s\" /></p>\n",
- $GET_URL, $attach_prop['part_id'],
- $attach_prop['filename'],
- $attach_prop['filename']);
+ if (strpos($attach_prop->mimetype, 'image/')===0)
+ $out .= sprintf("\n<hr />\n<p align=\"center\"><img src=\"%s&_part=%s\" alt=\"%s\" title=\"%s\" /></p>\n",
+ htmlspecialchars($GET_URL), $attach_prop->mime_id,
+ $attach_prop->filename,
+ $attach_prop->filename);
}
}
@@ -1140,15 +1166,12 @@
// find STYLE tags
while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos)))
{
- $pos2 += 8;
- $body_pre = substr($body, 0, $pos);
- $styles = substr($body, $pos, $pos2-$pos);
- $body_post = substr($body, $pos2, strlen($body)-$pos2);
-
+ $pos = strpos($body_lc, '>', $pos)+1;
+
// replace all css definitions with #container [def]
- $styles = rcmail_mod_css_styles($styles, $container_id);
-
- $body = $body_pre . $styles . $body_post;
+ $styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id);
+
+ $body = substr($body, 0, $pos) . $styles . substr($body, $pos2);
$last_style_pos = $pos2;
}
@@ -1187,13 +1210,13 @@
'/(<\/?meta[^>]*>)/i'),
'<!--\\1-->',
$body);
-
+
$out = preg_replace(array('/(<body[^>]*>)/i',
'/(<\/body>)/i'),
array('<div class="rcmBody">',
'</div>'),
$out);
-
+
return $out;
}
@@ -1239,133 +1262,88 @@
}
+function rcmail_has_html_part($message_parts)
+{
+ if (!is_array($message_parts))
+ return FALSE;
-// return first text part of a message
-function rcmail_first_text_part($message_parts)
+ // check all message parts
+ foreach ($message_parts as $pid => $part)
+ {
+ $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
+ if ($mimetype=='text/html')
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+// return first HTML part of a message
+function rcmail_first_html_part($message_struct)
{
- if (!is_array($message_parts))
+ global $IMAP;
+
+ if (!is_array($message_struct['parts']))
return FALSE;
$html_part = NULL;
-
+
// check all message parts
- foreach ($message_parts as $pid => $part)
+ foreach ($message_struct['parts'] as $pid => $part)
{
$mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
- if ($mimetype=='text/plain')
+ if ($mimetype=='text/html')
{
- $body = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']);
- $body = rcube_imap::charset_decode($body, $part->ctype_parameters);
- return $body;
- }
- else if ($mimetype=='text/html')
- {
- $html_part = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']);
- $html_part = rcube_imap::charset_decode($html_part, $part->ctype_parameters);
+ $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part);
}
}
-
- // convert HTML to plain text
if ($html_part)
- {
+ {
// remove special chars encoding
- $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
- $html_part = strtr($html_part, $trans);
+ //$trans = array_flip(get_html_translation_table(HTML_ENTITIES));
+ //$html_part = strtr($html_part, $trans);
- // create instance of html2text class
- $txt = new html2text($html_part);
- return $txt->get_text();
+ return $html_part;
}
return FALSE;
- }
+}
-// get source code of a specific message and cache it
-function rcmail_message_source($uid)
+// return first text part of a message
+function rcmail_first_text_part($message_struct)
{
- global $IMAP, $DB, $CONFIG;
+ global $IMAP;
- // get message ID if uid is given
- $cache_key = $IMAP->mailbox.'.msg';
- $cached = $IMAP->get_cached_message($cache_key, $uid, FALSE);
-
- // message is cached in database
- if ($cached && !empty($cached->body))
- return $cached->body;
+ if (empty($message_struct['parts']))
+ return $message_struct['UID'] ? $IMAP->get_body($message_struct['UID']) : false;
- if (!$cached)
- $headers = $IMAP->get_headers($uid);
- else
- $headers = &$cached;
-
- // create unique identifier based on message_id
- if (!empty($headers->messageID))
- $message_id = md5($headers->messageID);
- else
- $message_id = md5($headers->uid.'@'.$_SESSION['imap_host']);
-
- $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '');
- $cache_dir = $temp_dir.$_SESSION['client_id'];
- $cache_path = $cache_dir.'/'.$message_id;
-
- // message is cached in temp dir
- if ($CONFIG['enable_caching'] && is_dir($cache_dir) && is_file($cache_path))
+ // check all message parts
+ foreach ($message_struct['parts'] as $pid => $part)
{
- if ($fp = fopen($cache_path, 'r'))
+ $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
+
+ if ($mimetype=='text/plain')
+ return $IMAP->get_message_part($message_struct['UID'], $pid, $part);
+
+ else if ($mimetype=='text/html')
{
- $msg_source = fread($fp, filesize($cache_path));
- fclose($fp);
- return $msg_source;
+ $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part);
+
+ // remove special chars encoding
+ $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
+ $html_part = strtr($html_part, $trans);
+
+ // create instance of html2text class
+ $txt = new html2text($html_part);
+ return $txt->get_text();
}
}
-
- // get message from server
- $msg_source = $IMAP->get_raw_body($uid);
-
- // return message source without caching
- if (!$CONFIG['enable_caching'])
- return $msg_source;
-
-
- // let's cache the message body within the database
- if ($cached && ($CONFIG['db_max_length'] -300) > $headers->size)
- {
- $DB->query("UPDATE ".get_table_name('messages')."
- SET body=?
- WHERE user_id=?
- AND cache_key=?
- AND uid=?",
- $msg_source,
- $_SESSION['user_id'],
- $cache_key,
- $uid);
-
- return $msg_source;
- }
-
-
- // create dir for caching
- if (!is_dir($cache_dir))
- $dir = mkdir($cache_dir);
- else
- $dir = true;
-
- // attempt to write a file with the message body
- if ($dir && ($fp = fopen($cache_path, 'w')))
- {
- fwrite($fp, $msg_source);
- fclose($fp);
- }
- else
- {
- raise_error(array('code' => 403, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
- 'message' => "Failed to write to temp dir"), TRUE, FALSE);
- }
-
- return $msg_source;
+ return FALSE;
}
@@ -1434,19 +1412,19 @@
if (!is_array($MESSAGE) || !is_array($MESSAGE['parts']) || !($_GET['_uid'] && $_GET['_part']) || !$MESSAGE['parts'][$_GET['_part']])
return '';
- $part = $MESSAGE['parts'][$_GET['_part']];
+ $part = &$MESSAGE['parts'][$_GET['_part']];
$attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'summary'));
$out = '<table '. $attrib_str . ">\n";
$filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];
- $filesize = strlen($IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
+ $filesize = $part->size;
if ($filename)
{
$out .= sprintf('<tr><td class="title">%s</td><td>%s</td><td>[<a href="./?%s">%s</a>]</tr>'."\n",
rcube_label('filename'),
- rep_specialchars_output($filename),
+ rep_specialchars_output(rcube_imap::decode_mime_string($filename)),
str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']),
rcube_label('download'));
}
@@ -1473,31 +1451,9 @@
$attrib['src'] = './?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
$attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height'));
- $out = '<iframe '. $attrib_str . "></ifame>";
+ $out = '<iframe '. $attrib_str . "></iframe>";
return $out;
- }
-
-
-// create temp dir for attachments
-function rcmail_create_compose_tempdir()
- {
- global $CONFIG;
-
- if ($_SESSION['compose']['temp_dir'])
- return $_SESSION['compose']['temp_dir'];
-
- if (!empty($CONFIG['temp_dir']))
- $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];
-
- // create temp-dir for uploaded attachments
- if (!empty($CONFIG['temp_dir']) && is_writeable($CONFIG['temp_dir']))
- {
- mkdir($temp_dir);
- $_SESSION['compose']['temp_dir'] = $temp_dir;
- }
-
- return $_SESSION['compose']['temp_dir'];
}
@@ -1506,15 +1462,11 @@
{
if (!isset($_SESSION['compose']))
return;
-
+
// remove attachment files from temp dir
if (is_array($_SESSION['compose']['attachments']))
foreach ($_SESSION['compose']['attachments'] as $attachment)
@unlink($attachment['path']);
-
- // kill temp dir
- if ($_SESSION['compose']['temp_dir'])
- @rmdir($_SESSION['compose']['temp_dir']);
unset($_SESSION['compose']);
}
--
Gitblit v1.9.1