From be9aacaa5296dfca63fb3a01c2dc52538d1546aa Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 12:31:31 -0500
Subject: [PATCH] Bring back lost localization for the about page
---
program/include/rcube_message.php | 187 ++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 48 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index d0959ef..87319f0 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -17,9 +17,6 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
@@ -27,15 +24,16 @@
* Logical representation of a mail message with all its data
* and related functions
*
- * @package Mail
+ * @package Framework
+ * @subpackage Storage
* @author Thomas Bruederli <roundcube@gmail.com>
*/
class rcube_message
{
/**
- * Instace of rcmail.
+ * Instace of framework class.
*
- * @var rcmail
+ * @var rcube
*/
private $app;
@@ -53,13 +51,14 @@
*/
private $mime;
private $opt = array();
- private $inline_parts = array();
private $parse_alternative = false;
- public $uid = null;
+ public $uid;
+ public $folder;
public $headers;
public $parts = array();
public $mime_parts = array();
+ public $inline_parts = array();
public $attachments = array();
public $subject = '';
public $sender = null;
@@ -71,16 +70,21 @@
*
* Provide a uid, and parse message structure.
*
- * @param string $uid The message UID.
+ * @param string $uid The message UID.
+ * @param string $folder Folder name
*
* @see self::$app, self::$storage, self::$opt, self::$parts
*/
- function __construct($uid)
+ function __construct($uid, $folder = null)
{
$this->uid = $uid;
- $this->app = rcmail::get_instance();
+ $this->app = rcube::get_instance();
$this->storage = $this->app->get_storage();
+ $this->folder = strlen($folder) ? $folder : $this->storage->get_folder();
$this->storage->set_options(array('all_headers' => true));
+
+ // Set current folder
+ $this->storage->set_folder($this->folder);
$this->headers = $this->storage->get_message($uid);
@@ -96,8 +100,10 @@
$this->opt = array(
'safe' => $this->is_safe,
'prefer_html' => $this->app->config->get('prefer_html'),
- 'get_url' => rcmail_url('get', array(
- '_mbox' => $this->storage->get_folder(), '_uid' => $uid))
+ 'get_url' => $this->app->url(array(
+ 'action' => 'get',
+ 'mbox' => $this->storage->get_folder(),
+ 'uid' => $uid))
);
if (!empty($this->headers->structure)) {
@@ -164,11 +170,13 @@
/**
* Get content of a specific part of this message
*
- * @param string $mime_id Part MIME-ID
- * @param resource $fp File pointer to save the message part
+ * @param string $mime_id Part MIME-ID
+ * @param resource $fp File pointer to save the message part
+ * @param boolean $skip_charset_conv Disables charset conversion
+ *
* @return string Part content
*/
- public function get_part_content($mime_id, $fp=NULL)
+ public function get_part_content($mime_id, $fp = null, $skip_charset_conv = false)
{
if ($part = $this->mime_parts[$mime_id]) {
// stored in message structure (winmail/inline-uuencode)
@@ -178,25 +186,50 @@
}
return $fp ? true : $part->body;
}
+
// get from IMAP
- return $this->storage->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
- } else
- return null;
+ $this->storage->set_folder($this->folder);
+
+ return $this->storage->get_message_part($this->uid, $mime_id, $part, NULL, $fp, $skip_charset_conv);
+ }
}
/**
* Determine if the message contains a HTML part
*
+ * @param bool $recursive Enables checking in all levels of the structure
+ * @param bool $enriched Enables checking for text/enriched parts too
+ *
* @return bool True if a HTML is available, False if not
*/
- function has_html_part()
+ function has_html_part($recursive = true, $enriched = false)
{
// check all message parts
- foreach ($this->parts as $pid => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html')
+ foreach ($this->parts as $part) {
+ if ($part->mimetype == 'text/html' || ($enriched && $part->mimetype == 'text/enriched')) {
+ // Level check, we'll skip e.g. HTML attachments
+ if (!$recursive) {
+ $level = explode('.', $part->mime_id);
+
+ // Skip if level too deep or part has a file name
+ if (count($level) > 2 || $part->filename) {
+ continue;
+ }
+
+ // HTML part can be on the lower level, if not...
+ if (count($level) > 1) {
+ array_pop($level);
+ $parent = $this->mime_parts[join('.', $level)];
+ // ... parent isn't multipart/alternative or related
+ if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
+ continue;
+ }
+ }
+ }
+
return true;
+ }
}
return false;
@@ -211,10 +244,9 @@
function first_html_part()
{
// check all message parts
- foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html') {
- return $this->get_part_content($mime_id);
+ foreach ($this->mime_parts as $pid => $part) {
+ if ($part->mimetype == 'text/html') {
+ return $this->get_part_content($pid);
}
}
}
@@ -234,17 +266,11 @@
// check all message parts
foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
-
- if ($mimetype == 'text/plain') {
+ if ($part->mimetype == 'text/plain') {
return $this->get_part_content($mime_id);
}
- else if ($mimetype == 'text/html') {
+ else if ($part->mimetype == 'text/html') {
$out = $this->get_part_content($mime_id);
-
- // remove special chars encoding
- $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
- $out = strtr($out, $trans);
// create instance of html2text class
$txt = new html2text($out);
@@ -254,6 +280,32 @@
$part = null;
return null;
+ }
+
+
+ /**
+ * Checks if part of the message is an attachment (or part of it)
+ *
+ * @param rcube_message_part $part Message part
+ *
+ * @return bool True if the part is an attachment part
+ */
+ public function is_attachment($part)
+ {
+ foreach ($this->attachments as $att_part) {
+ if ($att_part->mime_id == $part->mime_id) {
+ return true;
+ }
+
+ // check if the part is a subpart of another attachment part (message/rfc822)
+ if ($att_part->mimetype == 'message/rfc822') {
+ if (in_array($part, (array)$att_part->parts)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
}
@@ -318,6 +370,11 @@
foreach ($structure->parts as $p => $sub_part) {
$sub_mimetype = $sub_part->mimetype;
+ // skip empty text parts
+ if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) {
+ continue;
+ }
+
// check if sub part is
if ($sub_mimetype == 'text/plain')
$plain_part = $p;
@@ -362,7 +419,8 @@
$c->type = 'content';
$c->ctype_primary = 'text';
$c->ctype_secondary = 'plain';
- $c->body = rcube_label('htmlmessage');
+ $c->mimetype = 'text/plain';
+ $c->realtype = 'text/html';
$this->parts[] = $c;
}
@@ -370,7 +428,6 @@
// add html part as attachment
if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
$html_part = &$structure->parts[$html_part];
- $html_part->filename = rcube_label('htmlmessage');
$html_part->mimetype = 'text/html';
$this->attachments[] = $html_part;
@@ -382,8 +439,8 @@
$p->type = 'content';
$p->ctype_primary = 'text';
$p->ctype_secondary = 'plain';
- $p->body = rcube_label('encryptedmessage');
- $p->size = strlen($p->body);
+ $p->mimetype = 'text/plain';
+ $p->realtype = 'multipart/encrypted';
$this->parts[] = $p;
}
@@ -424,7 +481,7 @@
if ($plugin['abort'])
continue;
- if ($part_mimetype == 'text/html') {
+ if ($part_mimetype == 'text/html' && $mail_part->size) {
$got_html_part = true;
}
@@ -441,8 +498,13 @@
}
// list as attachment as well
- if (!empty($mail_part->filename))
+ if (!empty($mail_part->filename)) {
$this->attachments[] = $mail_part;
+ }
+ // list html part as attachment (here the part is most likely inside a multipart/related part)
+ else if ($this->parse_alternative && ($secondary_type == 'html' && !$this->opt['prefer_html'])) {
+ $this->attachments[] = $mail_part;
+ }
}
// part message/*
else if ($primary_type == 'message') {
@@ -592,8 +654,10 @@
function tnef_decode(&$part)
{
// @TODO: attachment may be huge, hadle it via file
- if (!isset($part->body))
+ if (!isset($part->body)) {
+ $this->storage->set_folder($this->folder);
$part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
+ }
$parts = array();
$tnef = new tnef_decoder;
@@ -628,40 +692,67 @@
function uu_decode(&$part)
{
// @TODO: messages may be huge, hadle body via file
- if (!isset($part->body))
+ if (!isset($part->body)) {
+ $this->storage->set_folder($this->folder);
$part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
+ }
$parts = array();
// FIXME: line length is max.65?
- $uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n(([\x21-\x7E]{0,65}\n)+)`\nend/s';
+ $uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n/s';
if (preg_match_all($uu_regexp, $part->body, $matches, PREG_SET_ORDER)) {
- // remove attachments bodies from the message body
- $part->body = preg_replace($uu_regexp, '', $part->body);
// update message content-type
$part->ctype_primary = 'multipart';
$part->ctype_secondary = 'mixed';
$part->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
+ $uu_endstring = "`\nend\n";
// add attachments to the structure
foreach ($matches as $pid => $att) {
+ $startpos = strpos($part->body, $att[1]) + strlen($att[1]) + 1; // "\n"
+ $endpos = strpos($part->body, $uu_endstring);
+ $filebody = substr($part->body, $startpos, $endpos-$startpos);
+
+ // remove attachments bodies from the message body
+ $part->body = substr_replace($part->body, "", $startpos, $endpos+strlen($uu_endstring)-$startpos);
+
$uupart = new rcube_message_part;
$uupart->filename = trim($att[1]);
$uupart->encoding = 'stream';
- $uupart->body = convert_uudecode($att[2]);
+ $uupart->body = convert_uudecode($filebody);
$uupart->size = strlen($uupart->body);
$uupart->mime_id = 'uu.' . $part->mime_id . '.' . $pid;
- $ctype = rc_mime_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
+ $ctype = rcube_mime::content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
$uupart->mimetype = $ctype;
list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);
$parts[] = $uupart;
unset($matches[$pid]);
}
+
+ // remove attachments bodies from the message body
+ $part->body = preg_replace($uu_regexp, '', $part->body);
}
return $parts;
}
+
+
+ /**
+ * Deprecated methods (to be removed)
+ */
+
+ public static function unfold_flowed($text)
+ {
+ return rcube_mime::unfold_flowed($text);
+ }
+
+ public static function format_flowed($text, $length = 72)
+ {
+ return rcube_mime::format_flowed($text, $length);
+ }
+
}
--
Gitblit v1.9.1