No OneTemporary
Actions

Size

73 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
	index 77d74765b..884141a56 100644
	--- a/program/lib/Roundcube/rcube_message.php
	+++ b/program/lib/Roundcube/rcube_message.php
	@@ -1,1036 +1,1037 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2014, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Logical representation of a mail message with all its data \|
	\| and related functions \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Logical representation of a mail message with all its data
	* and related functions
	*
	* @package Framework
	* @subpackage Storage
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/
	class rcube_message
	{
	/**
	* Instace of framework class.
	*
	* @var rcube
	*/
	private $app;

	/**
	* Instance of storage class
	*
	* @var rcube_storage
	*/
	private $storage;

	/**
	* Instance of mime class
	*
	* @var rcube_mime
	*/
	private $mime;
	private $opt = array();
	private $parse_alternative = false;

	public $uid;
	public $folder;
	public $headers;
	public $sender;
	public $parts = array();
	public $mime_parts = array();
	public $inline_parts = array();
	public $attachments = array();
	public $subject = '';
	public $is_safe = false;

	const BODY_MAX_SIZE = 1048576; // 1MB


	/**
	* __construct
	*
	* Provide a uid, and parse message structure.
	*
	- * @param string $uid The message UID.
	- * @param string $folder Folder name
	+ * @param string $uid The message UID.
	+ * @param string $folder Folder name
	+ * @param bool $is_safe Security flag
	*
	* @see self::$app, self::$storage, self::$opt, self::$parts
	*/
	- function __construct($uid, $folder = null)
	+ function __construct($uid, $folder = null, $is_safe = false)
	{
	// decode combined UID-folder identifier
	if (preg_match('/^\d+-.+/', $uid)) {
	list($uid, $folder) = explode('-', $uid, 2);
	}

	- $this->uid = $uid;
	- $this->app = rcube::get_instance();
	+ $this->uid = $uid;
	+ $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->storage->set_options(array('all_headers' => true));

	$this->headers = $this->storage->get_message($uid);

	if (!$this->headers) {
	return;
	}

	$this->mime = new rcube_mime($this->headers->charset);
	$this->subject = $this->headers->get('subject');
	list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));

	- $this->set_safe((intval($_GET['_safe']) \|\| $_SESSION['safe_messages'][$this->folder.':'.$uid]));
	+ $this->set_safe($is_safe \|\| $_SESSION['safe_messages'][$this->folder.':'.$uid]);
	$this->opt = array(
	'safe' => $this->is_safe,
	'prefer_html' => $this->app->config->get('prefer_html'),
	'get_url' => $this->app->url(array(
	'action' => 'get',
	'mbox' => $this->folder,
	'uid' => $uid))
	);

	if (!empty($this->headers->structure)) {
	$this->get_mime_numbers($this->headers->structure);
	$this->parse_structure($this->headers->structure);
	}
	else {
	$this->body = $this->storage->get_body($uid);
	}

	// notify plugins and let them analyze this structured message object
	$this->app->plugins->exec_hook('message_load', array('object' => $this));
	}

	/**
	* Return a (decoded) message header
	*
	* @param string $name Header name
	* @param bool $row Don't mime-decode the value
	* @return string Header value
	*/
	public function get_header($name, $raw = false)
	{
	if (empty($this->headers)) {
	return null;
	}

	return $this->headers->get($name, !$raw);
	}

	/**
	* Set is_safe var and session data
	*
	* @param bool $safe enable/disable
	*/
	public function set_safe($safe = true)
	{
	$_SESSION['safe_messages'][$this->folder.':'.$this->uid] = $this->is_safe = $safe;
	}

	/**
	* Compose a valid URL for getting a message part
	*
	* @param string $mime_id Part MIME-ID
	* @param mixed $embed Mimetype class for parts to be embedded
	* @return string URL or false if part does not exist
	*/
	public function get_part_url($mime_id, $embed = false)
	{
	if ($this->mime_parts[$mime_id])
	return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1&_mimeclass=' . $embed : '');
	else
	return false;
	}

	/**
	* 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 boolean $skip_charset_conv Disables charset conversion
	* @param int $max_bytes Only read this number of bytes
	* @param boolean $formatted Enables formatting of text/* parts bodies
	*
	* @return string Part content
	* @deprecated
	*/
	public function get_part_content($mime_id, $fp = null, $skip_charset_conv = false, $max_bytes = 0, $formatted = true)
	{
	if ($part = $this->mime_parts[$mime_id]) {
	// stored in message structure (winmail/inline-uuencode)
	if (!empty($part->body) \|\| $part->encoding == 'stream') {
	if ($fp) {
	fwrite($fp, $part->body);
	}
	return $fp ? true : $part->body;
	}

	// get from IMAP
	$this->storage->set_folder($this->folder);

	return $this->storage->get_message_part($this->uid, $mime_id, $part,
	NULL, $fp, $skip_charset_conv, $max_bytes, $formatted);
	}
	}

	/**
	* Get content of a specific part of this message
	*
	* @param string $mime_id Part ID
	* @param boolean $formatted Enables formatting of text/* parts bodies
	* @param int $max_bytes Only return/read this number of bytes
	* @param mixed $mode NULL to return a string, -1 to print body
	* or file pointer to save the body into
	*
	* @return string\|bool Part content or operation status
	*/
	public function get_part_body($mime_id, $formatted = false, $max_bytes = 0, $mode = null)
	{
	if (!($part = $this->mime_parts[$mime_id])) {
	return;
	}

	// allow plugins to modify part body
	$plugin = $this->app->plugins->exec_hook('message_part_body',
	array('object' => $this, 'part' => $part));

	// only text parts can be formatted
	$formatted = $formatted && $part->ctype_primary == 'text';

	// part body not fetched yet... save in memory if it's small enough
	if ($part->body === null && is_numeric($mime_id) && $part->size < self::BODY_MAX_SIZE) {
	$this->storage->set_folder($this->folder);
	// Warning: body here should be always unformatted
	$part->body = $this->storage->get_message_part($this->uid, $mime_id, $part,
	null, null, true, 0, false);
	}

	// body stored in message structure (winmail/inline-uuencode)
	if ($part->body !== null \|\| $part->encoding == 'stream') {
	$body = $part->body;

	if ($formatted && $body) {
	$body = self::format_part_body($body, $part, $this->headers->charset);
	}

	if ($max_bytes && strlen($body) > $max_bytes) {
	$body = substr($body, 0, $max_bytes);
	}

	if (is_resource($mode)) {
	if ($body !== false) {
	fwrite($mode, $body);
	rewind($mode);
	}

	return $body !== false;
	}

	if ($mode === -1) {
	if ($body !== false) {
	print($body);
	}

	return $body !== false;
	}

	return $body;
	}

	// get the body from IMAP
	$this->storage->set_folder($this->folder);

	$body = $this->storage->get_message_part($this->uid, $mime_id, $part,
	$mode === -1, is_resource($mode) ? $mode : null,
	!($mode && $formatted), $max_bytes, $mode && $formatted);

	if (is_resource($mode)) {
	rewind($mode);
	return $body !== false;
	}

	if (!$mode && $body && $formatted) {
	$body = self::format_part_body($body, $part, $this->headers->charset);
	}

	return $body;
	}

	/**
	* Format text message part for display
	*
	* @param string $body Part body
	* @param rcube_message_part $part Part object
	* @param string $default_charset Fallback charset if part charset is not specified
	*
	* @return string Formatted body
	*/
	public static function format_part_body($body, $part, $default_charset = null)
	{
	// remove useless characters
	$body = preg_replace('/[\t\r\0\x0B]+\n/', "\n", $body);

	// remove NULL characters if any (#1486189)
	if (strpos($body, "\x00") !== false) {
	$body = str_replace("\x00", '', $body);
	}

	// detect charset...
	if (!$part->charset \|\| strtoupper($part->charset) == 'US-ASCII') {
	// try to extract charset information from HTML meta tag (#1488125)
	if ($part->ctype_secondary == 'html' && preg_match('/<meta[^>]+charset=([a-z0-9-_]+)/i', $body, $m)) {
	$part->charset = strtoupper($m[1]);
	}
	else if ($default_charset) {
	$part->charset = $default_charset;
	}
	else {
	$rcube = rcube::get_instance();
	$part->charset = $rcube->config->get('default_charset', RCUBE_CHARSET);
	}
	}

	// ..convert charset encoding
	$body = rcube_charset::convert($body, $part->charset);

	return $body;
	}

	/**
	* Determine if the message contains a HTML part. This must to be
	* a real part not an attachment (or its part)
	*
	* @param bool $enriched Enables checking for text/enriched parts too
	* @param rcube_message_part &$part Reference to the part if found
	*
	* @return bool True if a HTML is available, False if not
	*/
	public function has_html_part($enriched = false, &$part = null)
	{
	// check all message parts
	foreach ($this->mime_parts as $part) {
	if ($part->mimetype == 'text/html' \|\| ($enriched && $part->mimetype == 'text/enriched')) {
	// Skip if part is an attachment, don't use is_attachment() here
	if ($part->filename) {
	continue;
	}

	$level = explode('.', $part->mime_id);
	$depth = count($level);

	// Check if the part belongs to higher-level's multipart part
	// this can be alternative/related/signed/encrypted or mixed
	while (array_pop($level) !== null) {
	$parent_depth = count($level);
	if (!$parent_depth) {
	return true;
	}

	$parent = $this->mime_parts[join('.', $level)];
	if (!preg_match('/^multipart\/(alternative\|related\|signed\|encrypted\|mixed)$/', $parent->mimetype)
	\|\| ($parent->mimetype == 'multipart/mixed' && $parent_depth < $depth - 1)) {
	continue 2;
	}
	}

	if ($part->size) {
	return true;
	}
	}
	}

	$part = null;

	return false;
	}

	/**
	* Determine if the message contains a text/plain part. This must to be
	* a real part not an attachment (or its part)
	*
	* @param rcube_message_part &$part Reference to the part if found
	*
	* @return bool True if a plain text part is available, False if not
	*/
	public function has_text_part(&$part = null)
	{
	// check all message parts
	foreach ($this->mime_parts as $part) {
	if ($part->mimetype == 'text/plain') {
	// Skip if part is an attachment, don't use is_attachment() here
	if ($part->filename) {
	continue;
	}

	$level = explode('.', $part->mime_id);

	// Check if the part belongs to higher-level's alternative/related
	while (array_pop($level) !== null) {
	if (!count($level)) {
	return true;
	}

	$parent = $this->mime_parts[join('.', $level)];
	if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
	continue 2;
	}
	}

	if ($part->size) {
	return true;
	}
	}
	}

	$part = null;

	return false;
	}

	/**
	* Return the first HTML part of this message
	*
	* @param rcube_message_part &$part Reference to the part if found
	* @param bool $enriched Enables checking for text/enriched parts too
	*
	* @return string HTML message part content
	*/
	public function first_html_part(&$part = null, $enriched = false)
	{
	if ($this->has_html_part($enriched, $part)) {
	$body = $this->get_part_body($part->mime_id, true);

	if ($part->mimetype == 'text/enriched') {
	$body = rcube_enriched::to_html($body);
	}

	return $body;
	}
	}

	/**
	* Return the first text part of this message.
	* If there's no text/plain part but $strict=true and text/html part
	* exists, it will be returned in text/plain format.
	*
	* @param rcube_message_part &$part Reference to the part if found
	* @param bool $strict Check only text/plain parts
	*
	* @return string Plain text message/part content
	*/
	public function first_text_part(&$part = null, $strict = false)
	{
	// no message structure, return complete body
	if (empty($this->parts)) {
	return $this->body;
	}

	if ($this->has_text_part($part)) {
	return $this->get_part_body($part->mime_id, true);
	}

	if (!$strict && ($body = $this->first_html_part($part, true))) {
	// create instance of html2text class
	$h2t = new rcube_html2text($body);
	return $h2t->get_text();
	}
	}

	/**
	* 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;
	}

	/**
	* Read the message structure returend by the IMAP server
	* and build flat lists of content parts and attachments
	*
	* @param rcube_message_part $structure Message structure node
	* @param bool $recursive True when called recursively
	*/
	private function parse_structure($structure, $recursive = false)
	{
	// real content-type of message/rfc822 part
	if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype) {
	$mimetype = $structure->real_mimetype;

	// parse headers from message/rfc822 part
	if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
	list($headers, ) = explode("\r\n\r\n", $this->get_part_body($structure->mime_id, false, 32768));
	$structure->headers = rcube_mime::parse_headers($headers);
	}
	}
	else {
	$mimetype = $structure->mimetype;
	}

	// show message headers
	if ($recursive && is_array($structure->headers) &&
	(isset($structure->headers['subject']) \|\| $structure->headers['from'] \|\| $structure->headers['to'])) {
	$c = new stdClass;
	$c->type = 'headers';
	$c->headers = $structure->headers;
	$this->parts[] = $c;
	}

	// Allow plugins to handle message parts
	$plugin = $this->app->plugins->exec_hook('message_part_structure',
	array('object' => $this, 'structure' => $structure,
	'mimetype' => $mimetype, 'recursive' => $recursive));

	if ($plugin['abort']) {
	return;
	}

	$structure = $plugin['structure'];
	$mimetype = $plugin['mimetype'];
	$recursive = $plugin['recursive'];

	list($message_ctype_primary, $message_ctype_secondary) = explode('/', $mimetype);

	// print body if message doesn't have multiple parts
	if ($message_ctype_primary == 'text' && !$recursive) {
	// parts with unsupported type add to attachments list
	if (!in_array($message_ctype_secondary, array('plain', 'html', 'enriched'))) {
	$this->attachments[] = $structure;
	return;
	}

	$structure->type = 'content';
	$this->parts[] = $structure;

	// Parse simple (plain text) message body
	if ($message_ctype_secondary == 'plain') {
	foreach ((array)$this->uu_decode($structure) as $uupart) {
	$this->mime_parts[$uupart->mime_id] = $uupart;
	$this->attachments[] = $uupart;
	}
	}
	}
	// the same for pgp signed messages
	else if ($mimetype == 'application/pgp' && !$recursive) {
	$structure->type = 'content';
	$this->parts[] = $structure;
	}
	// message contains (more than one!) alternative parts
	else if ($mimetype == 'multipart/alternative'
	&& is_array($structure->parts) && count($structure->parts) > 1
	) {
	// get html/plaintext parts, other add to attachments list
	foreach ($structure->parts as $p => $sub_part) {
	$sub_mimetype = $sub_part->mimetype;
	$is_multipart = preg_match('/^multipart\/(related\|relative\|mixed\|alternative)/', $sub_mimetype);

	// skip empty text parts
	if (!$sub_part->size && !$is_multipart) {
	continue;
	}

	// We've encountered (malformed) messages with more than
	// one text/plain or text/html part here. There's no way to choose
	// which one is better, so we'll display first of them and add
	// others as attachments (#1489358)

	// check if sub part is
	if ($is_multipart)
	$related_part = $p;
	else if ($sub_mimetype == 'text/plain' && !$plain_part)
	$plain_part = $p;
	else if ($sub_mimetype == 'text/html' && !$html_part) {
	$html_part = $p;
	$this->got_html_part = true;
	}
	else if ($sub_mimetype == 'text/enriched' && !$enriched_part)
	$enriched_part = $p;
	else {
	// add unsupported/unrecognized parts to attachments list
	$this->attachments[] = $sub_part;
	}
	}

	// parse related part (alternative part could be in here)
	if ($related_part !== null && !$this->parse_alternative) {
	$this->parse_alternative = true;
	$this->parse_structure($structure->parts[$related_part], true);
	$this->parse_alternative = false;

	// if plain part was found, we should unset it if html is preferred
	if ($this->opt['prefer_html'] && count($this->parts))
	$plain_part = null;
	}

	// choose html/plain part to print
	if ($html_part !== null && $this->opt['prefer_html']) {
	$print_part = $structure->parts[$html_part];
	}
	else if ($enriched_part !== null) {
	$print_part = $structure->parts[$enriched_part];
	}
	else if ($plain_part !== null) {
	$print_part = $structure->parts[$plain_part];
	}

	// add the right message body
	if (is_object($print_part)) {
	$print_part->type = 'content';
	$this->parts[] = $print_part;
	}
	// show plaintext warning
	else if ($html_part !== null && empty($this->parts)) {
	$c = new stdClass;
	$c->type = 'content';
	$c->ctype_primary = 'text';
	$c->ctype_secondary = 'plain';
	$c->mimetype = 'text/plain';
	$c->realtype = 'text/html';

	$this->parts[] = $c;
	}
	}
	// this is an ecrypted message -> create a plaintext body with the according message
	else if ($mimetype == 'multipart/encrypted') {
	$p = new stdClass;
	$p->type = 'content';
	$p->ctype_primary = 'text';
	$p->ctype_secondary = 'plain';
	$p->mimetype = 'text/plain';
	$p->realtype = 'multipart/encrypted';
	$p->mime_id = $structure->mime_id;

	$this->parts[] = $p;

	// add encrypted payload part as attachment
	if (is_array($structure->parts)) {
	for ($i=0; $i < count($structure->parts); $i++) {
	$subpart = $structure->parts[$i];
	if ($subpart->mimetype == 'application/octet-stream' \|\| !empty($subpart->filename)) {
	$this->attachments[] = $subpart;
	}
	}
	}
	}
	// this is an S/MIME ecrypted message -> create a plaintext body with the according message
	else if ($mimetype == 'application/pkcs7-mime') {
	$p = new stdClass;
	$p->type = 'content';
	$p->ctype_primary = 'text';
	$p->ctype_secondary = 'plain';
	$p->mimetype = 'text/plain';
	$p->realtype = 'application/pkcs7-mime';
	$p->mime_id = $structure->mime_id;

	$this->parts[] = $p;

	if (!empty($structure->filename)) {
	$this->attachments[] = $structure;
	}
	}
	// message contains multiple parts
	else if (is_array($structure->parts) && !empty($structure->parts)) {
	// iterate over parts
	for ($i=0; $i < count($structure->parts); $i++) {
	$mail_part = &$structure->parts[$i];
	$primary_type = $mail_part->ctype_primary;
	$secondary_type = $mail_part->ctype_secondary;

	// real content-type of message/rfc822
	if ($mail_part->real_mimetype) {
	$part_orig_mimetype = $mail_part->mimetype;
	$part_mimetype = $mail_part->real_mimetype;
	list($primary_type, $secondary_type) = explode('/', $part_mimetype);
	}
	else {
	$part_mimetype = $part_orig_mimetype = $mail_part->mimetype;
	}

	// multipart/alternative
	if ($primary_type == 'multipart') {
	$this->parse_structure($mail_part, true);

	// list message/rfc822 as attachment as well (mostly .eml)
	if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// part text/[plain\|html] or delivery status
	else if ((($part_mimetype == 'text/plain' \|\| $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') \|\|
	in_array($part_mimetype, array('message/delivery-status', 'text/rfc822-headers', 'message/disposition-notification'))
	) {
	// Allow plugins to handle also this part
	$plugin = $this->app->plugins->exec_hook('message_part_structure',
	array('object' => $this, 'structure' => $mail_part,
	'mimetype' => $part_mimetype, 'recursive' => true));

	if ($plugin['abort'])
	continue;

	if ($part_mimetype == 'text/html' && $mail_part->size) {
	$this->got_html_part = true;
	}

	$mail_part = $plugin['structure'];
	list($primary_type, $secondary_type) = explode('/', $plugin['mimetype']);

	// add text part if it matches the prefs
	if (!$this->parse_alternative \|\|
	($secondary_type == 'html' && $this->opt['prefer_html']) \|\|
	($secondary_type == 'plain' && !$this->opt['prefer_html'])
	) {
	$mail_part->type = 'content';
	$this->parts[] = $mail_part;
	}

	// list as attachment as well
	if (!empty($mail_part->filename)) {
	$this->attachments[] = $mail_part;
	}
	}
	// part message/*
	else if ($primary_type == 'message') {
	$this->parse_structure($mail_part, true);

	// list as attachment as well (mostly .eml)
	if (!empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// ignore "virtual" protocol parts
	else if ($primary_type == 'protocol') {
	continue;
	}
	// part is Microsoft Outlook TNEF (winmail.dat)
	else if ($part_mimetype == 'application/ms-tnef') {
	$tnef_parts = (array) $this->tnef_decode($mail_part);
	foreach ($tnef_parts as $tpart) {
	$this->mime_parts[$tpart->mime_id] = $tpart;
	$this->attachments[] = $tpart;
	}

	// add winmail.dat to the list if it's content is unknown
	if (empty($tnef_parts) && !empty($mail_part->filename)) {
	$this->mime_parts[$mail_part->mime_id] = $mail_part;
	$this->attachments[] = $mail_part;
	}
	}
	// part is a file/attachment
	else if (preg_match('/^(inline\|attach)/', $mail_part->disposition) \|\|
	$mail_part->headers['content-id'] \|\|
	($mail_part->filename &&
	(empty($mail_part->disposition) \|\| preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
	) {
	// skip apple resource forks
	if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
	continue;

	// part belongs to a related message and is linked
	if (preg_match('/^multipart\/(related\|relative)/', $mimetype)
	&& ($mail_part->headers['content-id'] \|\| $mail_part->headers['content-location'])) {
	if ($mail_part->headers['content-id'])
	$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
	if ($mail_part->headers['content-location'])
	$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];

	$this->inline_parts[] = $mail_part;
	}
	// attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
	else if ($part_orig_mimetype == 'message/rfc822') {
	$this->parse_structure($mail_part, true);

	// list as attachment as well (mostly .eml)
	if (!empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// regular attachment with valid content type
	// (content-type name regexp according to RFC4288.4.2)
	else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
	$this->attachments[] = $mail_part;
	}
	// attachment with invalid content type
	// replace malformed content type with application/octet-stream (#1487767)
	else if ($mail_part->filename) {
	$mail_part->ctype_primary = 'application';
	$mail_part->ctype_secondary = 'octet-stream';
	$mail_part->mimetype = 'application/octet-stream';

	$this->attachments[] = $mail_part;
	}
	}
	// attachment part as message/rfc822 (#1488026)
	else if ($mail_part->mimetype == 'message/rfc822') {
	$this->parse_structure($mail_part);
	}
	// calendar part not marked as attachment (#1490325)
	else if ($part_mimetype == 'text/calendar') {
	if (!$mail_part->filename) {
	$mail_part->filename = 'calendar.ics';
	}

	$this->attachments[] = $mail_part;
	}
	}

	// if this was a related part try to resolve references
	if (preg_match('/^multipart\/(related\|relative)/', $mimetype) && sizeof($this->inline_parts)) {
	$a_replaces = array();
	$img_regexp = '/^image\/(gif\|jpe?g\|png\|tiff\|bmp\|svg)/';

	foreach ($this->inline_parts as $inline_object) {
	$part_url = $this->get_part_url($inline_object->mime_id, $inline_object->ctype_primary);
	if (isset($inline_object->content_id))
	$a_replaces['cid:'.$inline_object->content_id] = $part_url;
	if ($inline_object->content_location) {
	$a_replaces[$inline_object->content_location] = $part_url;
	}

	if (!empty($inline_object->filename)) {
	// MS Outlook sends sometimes non-related attachments as related
	// In this case multipart/related message has only one text part
	// We'll add all such attachments to the attachments list
	if (!isset($this->got_html_part)) {
	$this->attachments[] = $inline_object;
	}
	// MS Outlook sometimes also adds non-image attachments as related
	// We'll add all such attachments to the attachments list
	// Warning: some browsers support pdf in <img/>
	else if (!preg_match($img_regexp, $inline_object->mimetype)) {
	$this->attachments[] = $inline_object;
	}
	// @TODO: we should fetch HTML body and find attachment's content-id
	// to handle also image attachments without reference in the body
	// @TODO: should we list all image attachments in text mode?
	}
	}

	// add replace array to each content part
	// (will be applied later when part body is available)
	foreach ($this->parts as $i => $part) {
	if ($part->type == 'content')
	$this->parts[$i]->replaces = $a_replaces;
	}
	}
	}
	// message is a single part non-text
	else if ($structure->filename) {
	$this->attachments[] = $structure;
	}
	// message is a single part non-text (without filename)
	else if (preg_match('/application\//i', $mimetype)) {
	$this->attachments[] = $structure;
	}
	}

	/**
	* Fill aflat array with references to all parts, indexed by part numbers
	*
	* @param rcube_message_part $part Message body structure
	*/
	private function get_mime_numbers(&$part)
	{
	if (strlen($part->mime_id))
	$this->mime_parts[$part->mime_id] = &$part;

	if (is_array($part->parts))
	for ($i=0; $i<count($part->parts); $i++)
	$this->get_mime_numbers($part->parts[$i]);
	}

	/**
	* Decode a Microsoft Outlook TNEF part (winmail.dat)
	*
	* @param rcube_message_part $part Message part to decode
	* @return array
	*/
	function tnef_decode(&$part)
	{
	// @TODO: attachment may be huge, handle body via file
	$body = $this->get_part_body($part->mime_id);
	$tnef = new rcube_tnef_decoder;
	$tnef_arr = $tnef->decompress($body);
	$parts = array();

	unset($body);

	foreach ($tnef_arr as $pid => $winatt) {
	$tpart = new rcube_message_part;

	$tpart->filename = $this->fix_attachment_name(trim($winatt['name']), $part);
	$tpart->encoding = 'stream';
	$tpart->ctype_primary = trim(strtolower($winatt['type']));
	$tpart->ctype_secondary = trim(strtolower($winatt['subtype']));
	$tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
	$tpart->mime_id = 'winmail.' . $part->mime_id . '.' . $pid;
	$tpart->size = $winatt['size'];
	$tpart->body = $winatt['stream'];

	$parts[] = $tpart;
	unset($tnef_arr[$pid]);
	}

	return $parts;
	}

	/**
	* Parse message body for UUencoded attachments bodies
	*
	* @param rcube_message_part $part Message part to decode
	* @return array
	*/
	function uu_decode(&$part)
	{
	// @TODO: messages may be huge, handle body via file
	$part->body = $this->get_part_body($part->mime_id);
	$parts = array();
	$pid = 0;

	// FIXME: line length is max.65?
	$uu_regexp_begin = '/begin [0-7]{3,4} ([^\r\n]+)\r?\n/s';
	$uu_regexp_end = '/`\r?\nend((\r?\n)\|($))/s';

	while (preg_match($uu_regexp_begin, $part->body, $matches, PREG_OFFSET_CAPTURE)) {
	$startpos = $matches[0][1];

	if (!preg_match($uu_regexp_end, $part->body, $m, PREG_OFFSET_CAPTURE, $startpos)) {
	break;
	}

	$endpos = $m[0][1];
	$begin_len = strlen($matches[0][0]);
	$end_len = strlen($m[0][0]);

	// extract attachment body
	$filebody = substr($part->body, $startpos + $begin_len, $endpos - $startpos - $begin_len - 1);
	$filebody = str_replace("\r\n", "\n", $filebody);

	// remove attachment body from the message body
	$part->body = substr_replace($part->body, '', $startpos, $endpos + $end_len - $startpos);
	// mark body as modified so it will not be cached by rcube_imap_cache
	$part->body_modified = true;

	// add attachments to the structure
	$uupart = new rcube_message_part;
	$uupart->filename = trim($matches[1][0]);
	$uupart->encoding = 'stream';
	$uupart->body = convert_uudecode($filebody);
	$uupart->size = strlen($uupart->body);
	$uupart->mime_id = 'uu.' . $part->mime_id . '.' . $pid;

	$ctype = rcube_mime::file_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
	$uupart->mimetype = $ctype;
	list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);

	$parts[] = $uupart;
	$pid++;
	}

	return $parts;
	}

	/**
	* Fix attachment name encoding if needed/possible
	*/
	protected function fix_attachment_name($name, $part)
	{
	if ($name == rcube_charset::clean($name)) {
	return $name;
	}

	// find charset from part or its parent(s)
	if ($part->charset) {
	$charsets[] = $part->charset;
	}
	else {
	// check first part (common case)
	$n = strpos($part->mime_id, '.') ? preg_replace('/\.[0-9]+$/', '', $part->mime_id) . '.1' : 1;
	if (($_part = $this->mime_parts[$n]) && $_part->charset) {
	$charsets[] = $_part->charset;
	}

	// check parents' charset
	$items = explode('.', $part->mime_id);
	for ($i = count($items)-1; $i > 0; $i--) {
	$last = array_pop($items);
	$parent = $this->mime_parts[join('.', $items)];

	if ($parent && $parent->charset) {
	$charsets[] = $parent->charset;
	}
	}
	}

	if ($this->headers->charset) {
	$charsets[] = $this->headers->charset;
	}

	if (empty($charsets)) {
	$rcube = rcube::get_instance();
	$charsets[] = rcube_charset::detect($name, $rcube->config->get('default_charset', RCUBE_CHARSET));
	}

	foreach (array_unique($charsets) as $charset) {
	$_name = rcube_charset::convert($name, $charset);

	if ($_name == rcube_charset::clean($_name)) {
	if (!$part->charset) {
	$part->charset = $charset;
	}

	return $_name;
	}
	}

	return $name;
	}

	/**
	* 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);
	}
	}
	diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
	index dc056f11f..fba22f97b 100644
	--- a/program/steps/mail/get.inc
	+++ b/program/steps/mail/get.inc
	@@ -1,480 +1,478 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| program/steps/mail/get.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Delivering a specific part of a mail message \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	// show loading page
	if (!empty($_GET['_preload'])) {
	$_get = $_GET + array('_mimewarning' => 1, '_embed' => 1);
	unset($_get['_preload']);
	$url = $RCMAIL->url($_get);
	$message = $RCMAIL->gettext('loadingdata');

	header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
	print "<html>\n<head>\n"
	. '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
	. '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
	. "</head>\n<body>\n$message\n</body>\n</html>";
	exit;
	}

	ob_end_clean();

	-
	// similar code as in program/steps/mail/show.inc
	if (!empty($_GET['_uid'])) {
	$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
	$RCMAIL->config->set('prefer_html', true);
	- $MESSAGE = new rcube_message($uid);
	+ $MESSAGE = new rcube_message($uid, null, intval($_GET['_safe']));
	}

	// check connection status
	check_storage_status();

	$part_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GPC);

	// show part page
	if (!empty($_GET['_frame'])) {
	if ($part_id && ($part = $MESSAGE->mime_parts[$part_id])) {
	$filename = rcmail_attachment_name($part);
	$OUTPUT->set_pagetitle($filename);
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'messagepartframe' => 'rcmail_message_part_frame',
	'messagepartcontrols' => 'rcmail_message_part_controls',
	));

	$OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
	$OUTPUT->set_env('uid', $uid);
	$OUTPUT->set_env('part', $part_id);
	$OUTPUT->set_env('filename', $filename);

	$OUTPUT->send('messagepart');
	exit;
	}

	// render thumbnail of an image attachment
	else if ($_GET['_thumb']) {
	$pid = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GET);
	if ($part = $MESSAGE->mime_parts[$pid]) {
	$thumbnail_size = $RCMAIL->config->get('image_thumbnail_size', 240);
	$temp_dir = $RCMAIL->config->get('temp_dir');
	$mimetype = $part->mimetype;
	$file_ident = $MESSAGE->headers->messageID . ':' . $part->mime_id . ':' . $part->size . ':' . $part->mimetype;
	$cache_basename = $temp_dir . '/' . md5($file_ident . ':' . $RCMAIL->user->ID . ':' . $thumbnail_size);
	$cache_file = $cache_basename . '.thumb';

	// render thumbnail image if not done yet
	if (!is_file($cache_file)) {
	if ($fp = fopen(($orig_name = $cache_basename . '.tmp'), 'w')) {
	$MESSAGE->get_part_body($part->mime_id, false, 0, $fp);
	fclose($fp);

	$image = new rcube_image($orig_name);
	if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) {
	$mimetype = 'image/' . $imgtype;
	unlink($orig_name);
	}
	else {
	rename($orig_name, $cache_file);
	}
	}
	}

	if (is_file($cache_file)) {
	header('Content-Type: ' . $mimetype);
	readfile($cache_file);
	}
	}

	exit;
	}
	-
	else if (strlen($part_id)) {
	if ($part = $MESSAGE->mime_parts[$part_id]) {
	$mimetype = rcmail_fix_mimetype($part->mimetype);

	// allow post-processing of the message body
	$plugin = $RCMAIL->plugins->exec_hook('message_part_get', array(
	'uid' => $MESSAGE->uid,
	'id' => $part->mime_id,
	'mimetype' => $mimetype,
	'part' => $part,
	'download' => !empty($_GET['_download'])
	));

	if ($plugin['abort']) {
	exit;
	}

	// overwrite modified vars from plugin
	$mimetype = $plugin['mimetype'];
	$extensions = rcube_mime::get_mime_extensions($mimetype);

	if ($plugin['body']) {
	$body = $plugin['body'];
	}

	// compare file mimetype with the stated content-type headers and file extension to avoid malicious operations
	if (!empty($_REQUEST['_embed']) && empty($_REQUEST['_nocheck'])) {
	$file_extension = strtolower(pathinfo($part->filename, PATHINFO_EXTENSION));

	// 1. compare filename suffix with expected suffix derived from mimetype
	$valid = $file_extension && in_array($file_extension, (array)$extensions) \|\| empty($extensions) \|\| !empty($_REQUEST['_mimeclass']);

	// 2. detect the real mimetype of the attachment part and compare it with the stated mimetype and filename extension
	if ($valid \|\| !$file_extension \|\| $mimetype == 'application/octet-stream' \|\| stripos($mimetype, 'text/') === 0) {
	$tmp_body = $body ?: $MESSAGE->get_part_body($part->mime_id, false, 2048);

	// detect message part mimetype
	$real_mimetype = rcube_mime::file_content_type($tmp_body, $part->filename, $mimetype, true, true);
	list($real_ctype_primary, $real_ctype_secondary) = explode('/', $real_mimetype);

	// accept text/plain with any extension
	if ($real_mimetype == 'text/plain' && $real_mimetype == $mimetype) {
	$valid_extension = true;
	}
	// ignore differences in text/* mimetypes. Filetype detection isn't very reliable here
	else if ($real_ctype_primary == 'text' && strpos($mimetype, $real_ctype_primary) === 0) {
	$real_mimetype = $mimetype;
	$valid_extension = true;
	}
	// ignore filename extension if mimeclass matches (#1489029)
	else if (!empty($_REQUEST['_mimeclass']) && $real_ctype_primary == $_REQUEST['_mimeclass']) {
	$valid_extension = true;
	}
	else {
	// get valid file extensions
	$extensions = rcube_mime::get_mime_extensions($real_mimetype);
	$valid_extension = !$file_extension \|\| empty($extensions) \|\| in_array($file_extension, (array)$extensions);
	}

	// fix mimetype for images wrongly declared as octet-stream
	if ($mimetype == 'application/octet-stream' && strpos($real_mimetype, 'image/') === 0 && $valid_extension) {
	$mimetype = $real_mimetype;
	}

	// "fix" real mimetype the same way the original is before comparison
	$real_mimetype = rcmail_fix_mimetype($real_mimetype);

	$valid = $real_mimetype == $mimetype && $valid_extension;
	}
	else {
	$real_mimetype = $mimetype;
	}

	// show warning if validity checks failed
	if (!$valid) {
	// send blocked.gif for expected images
	if (empty($_REQUEST['_mimewarning']) && strpos($mimetype, 'image/') === 0) {
	// Do not cache. Failure might be the result of a misconfiguration, thus real content should be returned once fixed.
	$content = $RCMAIL->get_resource_content('blocked.gif');
	$OUTPUT->nocacheing_headers();
	header("Content-Type: image/gif");
	header("Content-Transfer-Encoding: binary");
	header("Content-Length: " . strlen($content));
	echo $content;
	}
	else { // html warning with a button to load the file anyway
	$OUTPUT = new rcmail_html_page();
	$OUTPUT->write(html::tag('html', null, html::tag('body', 'embed',
	html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
	$RCMAIL->gettext(array(
	'name' => 'attachmentvalidationerror',
	'vars' => array(
	'expected' => $mimetype . ($file_extension ? " (.$file_extension)" : ''),
	'detected' => $real_mimetype . ($extensions[0] ? " (.$extensions[0])" : ''),
	)
	))
	. html::p(array('class' => 'rcmail-inline-buttons'),
	html::tag('button', array(
	'onclick' => "location.href='" . $RCMAIL->url(array_merge($_GET, array('_nocheck' => 1))) . "'"
	),
	$RCMAIL->gettext('showanyway'))
	)
	))));
	}

	exit;
	}
	}


	// TIFF to JPEG conversion, if needed
	$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
	if (!empty($_REQUEST['_embed']) && !$tiff_support
	&& rcube_image::is_convertable('image/tiff')
	&& rcmail_part_image_type($part) == 'image/tiff'
	) {
	$tiff2jpeg = true;
	$mimetype = 'image/jpeg';
	}


	$browser = $RCMAIL->output->browser;
	list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);

	if (!$plugin['download'] && $ctype_primary == 'text') {
	header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCUBE_CHARSET));
	}
	else {
	header("Content-Type: $mimetype");
	header("Content-Transfer-Encoding: binary");
	}

	// deliver part content
	if ($ctype_primary == 'text' && $ctype_secondary == 'html' && empty($plugin['download'])) {
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcube_utils::mem_check($part->size * 10)) {
	$out = '<body>' . $RCMAIL->gettext('messagetoobig'). ' '
	. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
	.'&_mbox='. urlencode($MESSAGE->folder), $RCMAIL->gettext('download')) . '</body></html>';
	}
	else {
	// get part body if not available
	if (!isset($body)) {
	$body = $MESSAGE->get_part_body($part->mime_id, true);
	}

	// show images?
	rcmail_check_safe($MESSAGE);

	// render HTML body
	$out = rcmail_print_body($body, $part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false));

	// insert remote objects warning into HTML body
	if ($REMOTE_OBJECTS) {
	$body_start = 0;
	if ($body_pos = strpos($out, '<body')) {
	$body_start = strpos($out, '>', $body_pos) + 1;
	}

	$out = substr($out, 0, $body_start)
	. html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
	rcube::Q($RCMAIL->gettext('blockedimages')) . ' ' .
	html::tag('button',
	array('onclick' => "location.href='" . $RCMAIL->url(array_merge($_GET, array('_safe' => 1))) . "'"),
	rcube::Q($RCMAIL->gettext('showimages')))
	)
	. substr($out, $body_start);
	}
	}

	// check connection status
	if ($part->size && empty($body)) {
	check_storage_status();
	}

	$OUTPUT = new rcmail_html_page();
	$OUTPUT->write($out);
	}
	else {
	// don't kill the connection if download takes more than 30 sec.
	@set_time_limit(0);

	$filename = rcmail_attachment_name($part);

	if ($browser->ie)
	$filename = rawurlencode($filename);
	else
	$filename = addcslashes($filename, '"');

	$disposition = !empty($plugin['download']) ? 'attachment' : 'inline';

	// Workaround for nasty IE bug (#1488844)
	// If Content-Disposition header contains string "attachment" e.g. in filename
	// IE handles data as attachment not inline
	if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
	$filename = str_ireplace('attachment', 'attach', $filename);
	}

	// add filename extension if missing
	if (!pathinfo($filename, PATHINFO_EXTENSION) && ($extensions = rcube_mime::get_mime_extensions($mimetype))) {
	$filename .= '.' . $extensions[0];
	}

	header("Content-Disposition: $disposition; filename=\"$filename\"");

	// handle tiff to jpeg conversion
	if (!empty($tiff2jpeg)) {
	$temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	$file_path = tempnam($temp_dir, 'rcmAttmnt');

	// write content to temp file
	if ($body) {
	$saved = file_put_contents($file_path, $body);
	}
	else if ($part->size) {
	$fd = fopen($file_path, 'w');
	$saved = $MESSAGE->get_part_body($part->mime_id, false, 0, $fd);
	fclose($fd);
	}

	// convert image to jpeg and send it to the browser
	if ($saved) {
	$image = new rcube_image($file_path);
	if ($image->convert(rcube_image::TYPE_JPG, $file_path)) {
	header("Content-Length: " . filesize($file_path));
	readfile($file_path);
	}
	unlink($file_path);
	}
	}
	// do content filtering to avoid XSS through fake images
	else if (!empty($_REQUEST['_embed']) && $browser->ie && $browser->ver <= 8) {
	if ($body) {
	echo preg_match('/<(script\|iframe\|object)/i', $body) ? '' : $body;
	$sent = true;
	}
	else if ($part->size) {
	$stdout = fopen('php://output', 'w');
	stream_filter_register('rcube_content', 'rcube_content_filter') or die('Failed to register content filter');
	stream_filter_append($stdout, 'rcube_content');
	$sent = $MESSAGE->get_part_body($part->mime_id, true, 0, $stdout);
	}
	}
	// send part as-it-is
	else {
	if ($body && empty($plugin['download'])) {
	header("Content-Length: " . strlen($body));
	echo $body;
	$sent = true;
	}
	else if ($part->size) {
	if ($size = (int)$part->d_parameters['size']) {
	header("Content-Length: $size");
	}

	$sent = $MESSAGE->get_part_body($part->mime_id, false, 0, -1);
	}
	}

	// check connection status
	if ($part->size && !$sent) {
	check_storage_status();
	}
	}

	exit;
	}
	}
	// print message
	else {
	// send correct headers for content type
	header("Content-Type: text/html");

	$cont = "<html>\n<head><title></title>\n</head>\n<body>";
	$cont .= rcmail_message_body(array());
	$cont .= "\n</body>\n</html>";

	$OUTPUT = new rcmail_html_page();
	$OUTPUT->write($cont);

	exit;
	}


	// if we arrive here, the requested part was not found
	header('HTTP/1.1 404 Not Found');
	exit;

	/**
	* Handles nicely storage connection errors
	*/
	function check_storage_status()
	{
	$error = rcmail::get_instance()->storage->get_error_code();

	// Check if we have a connection error
	if ($error == rcube_imap_generic::ERROR_BAD) {
	ob_end_clean();

	// Get action is often executed simultanously.
	// Some servers have MAXPERIP or other limits.
	// To workaround this we'll wait for some time
	// and try again (once).
	// Note: Random sleep interval is used to minimize concurency
	// in getting message parts

	if (!isset($_GET['_redirected'])) {
	usleep(rand(10,30)*100000); // 1-3 sec.
	header('Location: ' . $_SERVER['REQUEST_URI'] . '&_redirected=1');
	}
	else {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'Unable to get/display message part. IMAP connection error'),
	true, true);
	}

	// Don't kill session, just quit (#1486995)
	exit;
	}
	}

	/**
	* Attachment properties table
	*/
	function rcmail_message_part_controls($attrib)
	{
	global $MESSAGE, $RCMAIL;

	$part = asciiwords(rcube_utils::get_input_value('_part', rcube_utils::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' => 2));

	$table->add('title', rcube::Q($RCMAIL->gettext('namex')).':');
	$table->add('header', rcube::Q(rcmail_attachment_name($part)));

	$table->add('title', rcube::Q($RCMAIL->gettext('type')).':');
	$table->add('header', rcube::Q($part->mimetype));

	$table->add('title', rcube::Q($RCMAIL->gettext('size')).':');
	$table->add('header', rcube::Q($RCMAIL->message_part_size($part)));

	return $table->show($attrib);
	}

	/**
	* Attachment preview frame
	*/
	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE, $RCMAIL;

	$part = $MESSAGE->mime_parts[asciiwords(rcube_utils::get_input_value('_part', rcube_utils::INPUT_GPC))];
	$ctype_primary = strtolower($part->ctype_primary);

	$attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_embed=' : '_preload='), $_SERVER['QUERY_STRING']);

	$RCMAIL->output->add_gui_object('messagepartframe', $attrib['id']);

	return html::iframe($attrib);
	}
	diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
	index cf3432ab6..af43fc87c 100644
	--- a/program/steps/mail/show.inc
	+++ b/program/steps/mail/show.inc
	@@ -1,364 +1,363 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| program/steps/mail/show.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Display a mail message similar as a usual mail application does \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$PRINT_MODE = $RCMAIL->action == 'print' ? TRUE : FALSE;

	// Read browser capabilities and store them in session
	if ($caps = rcube_utils::get_input_value('_caps', rcube_utils::INPUT_GET)) {
	$browser_caps = array();
	foreach (explode(',', $caps) as $cap) {
	$cap = explode('=', $cap);
	$browser_caps[$cap[0]] = $cap[1];
	}
	$_SESSION['browser_caps'] = $browser_caps;
	}

	$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
	$mbox_name = $RCMAIL->storage->get_folder();

	// similar code as in program/steps/mail/get.inc
	if ($uid) {
	// set message format (need to be done before rcube_message construction)
	if (!empty($_GET['_format'])) {
	$prefer_html = $_GET['_format'] == 'html';
	$RCMAIL->config->set('prefer_html', $prefer_html);
	$_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
	}
	else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
	$RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
	}

	- $MESSAGE = new rcube_message($uid);
	+ $MESSAGE = new rcube_message($uid, $mbox_name, intval($_GET['_safe']));

	// if message not found (wrong UID)...
	if (empty($MESSAGE->headers)) {
	rcmail_message_error($uid);
	}

	-
	// show images?
	rcmail_check_safe($MESSAGE);

	// set message charset as default
	if (!empty($MESSAGE->headers->charset)) {
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);
	}

	$OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));

	// set message environment
	$OUTPUT->set_env('uid', $MESSAGE->uid);
	$OUTPUT->set_env('safemode', $MESSAGE->is_safe);
	$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
	$OUTPUT->set_env('mailbox', $mbox_name);
	$OUTPUT->set_env('permaurl', $RCMAIL->url(array('_action' => 'show', '_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));

	if ($MESSAGE->headers->get('list-post', false)) {
	$OUTPUT->set_env('list_post', true);
	}

	// set environment
	$OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());

	// set configuration
	$RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
	'skip_deleted', 'display_next', 'forward_attachment'));

	// set special folders
	foreach (array('drafts', 'trash', 'junk') as $mbox) {
	if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
	$OUTPUT->set_env($mbox . '_mailbox', $folder);
	}
	}

	// mimetypes supported by the browser (default settings)
	$mimetypes = (array)$RCMAIL->config->get('client_mimetypes');

	// Remove unsupported types, which makes that attachment which cannot be
	// displayed in a browser will be downloaded directly without displaying an overlay page
	if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
	// we can convert tiff to jpeg
	if (!rcube_image::is_convertable('image/tiff')) {
	unset($mimetypes[$key]);
	}
	}

	$OUTPUT->set_env('mimetypes', array_values($mimetypes));

	if ($MESSAGE->has_html_part()) {
	$prefer_html = $RCMAIL->config->get('prefer_html');
	$OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
	}

	if (!$OUTPUT->ajax_call) {
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
	}

	// check for unset disposition notification
	if ($MESSAGE->headers->mdn_to
	&& empty($MESSAGE->headers->flags['MDNSENT'])
	&& empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*'))
	&& $mbox_name != $RCMAIL->config->get('drafts_mbox')
	&& $mbox_name != $RCMAIL->config->get('sent_mbox')
	) {
	$mdn_cfg = intval($RCMAIL->config->get('mdn_requests'));

	if ($mdn_cfg == 1 \|\| (($mdn_cfg == 3 \|\| $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
	// Send MDN
	if (rcmail_send_mdn($MESSAGE, $smtp_error))
	$OUTPUT->show_message('receiptsent', 'confirmation');
	else if ($smtp_error)
	$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
	else
	$OUTPUT->show_message('errorsendingreceipt', 'error');
	}
	else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
	// Ask user
	$OUTPUT->add_label('mdnrequest');
	$OUTPUT->set_env('mdn_request', true);
	}
	}

	if (empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->action == 'show' \|\| ($RCMAIL->action == 'preview' && intval($RCMAIL->config->get('preview_pane_mark_read')) == 0))
	) {
	$RCMAIL->output->command('set_unread_message', $MESSAGE->uid, $mbox_name);
	$RCMAIL->plugins->exec_hook('message_read', array(
	'uid' => $MESSAGE->uid,
	'mailbox' => $mbox_name,
	'message' => $MESSAGE,
	));

	$set_seen_flag = true;
	}
	}


	$OUTPUT->add_handlers(array(
	'messageattachments' => 'rcmail_message_attachments',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageobjects' => 'rcmail_message_objects',
	'contactphoto' => 'rcmail_message_contactphoto',
	));


	if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
	$OUTPUT->send('messageprint', false);
	else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
	$OUTPUT->send('messagepreview', false);
	else
	$OUTPUT->send('message', false);


	// mark message as read
	if (!empty($set_seen_flag)) {
	if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN', $mbox_name)) {
	if ($count = rcmail_get_unseen_count($mbox_name)) {
	rcmail_set_unseen_count($mbox_name, $count - 1);
	}
	}
	}

	// Save preview_pane preference, if not set yet (#1490362)
	if ($RCMAIL->action == 'preview' && !$RCMAIL->config->get('preview_pane')) {
	$RCMAIL->user->save_prefs(array('preview_pane' => true));
	}

	exit;


	function rcmail_message_attachments($attrib)
	{
	global $PRINT_MODE, $MESSAGE, $RCMAIL;

	$out = $ol = '';
	$attachments = array();

	if (sizeof($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	$filename = rcmail_attachment_name($attach_prop, true);
	$filesize = $RCMAIL->message_part_size($attach_prop);

	if ($PRINT_MODE) {
	$ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $filesize)));
	}
	else {
	if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
	$title = $filename;
	$filename = abbreviate_string($filename, $attrib['maxlength']);
	}
	else {
	$title = '';
	}

	if ($attach_prop->size) {
	$size = ' ' . html::span('attachment-size', '(' . rcube::Q($filesize) . ')');
	}

	$mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
	$class = rcube_utils::file2class($mimetype, $filename);
	$id = 'attach' . $attach_prop->mime_id;
	$link = html::a(array(
	'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
	'onclick' => sprintf('return %s.command(\'load-attachment\',\'%s\',this)',
	rcmail_output::JS_OBJECT_NAME, $attach_prop->mime_id),
	'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
	'title' => rcube::Q($title),
	), rcube::Q($filename) . $size);

	$ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);

	$attachments[$attach_prop->mime_id] = $mimetype;
	}
	}

	$out = html::tag('ul', $attrib, $ol, html::$common_attrib);

	$RCMAIL->output->set_env('attachments', $attachments);
	}

	return $out;
	}

	function rcmail_remote_objects_msg()
	{
	global $MESSAGE, $RCMAIL;

	$attrib['id'] = 'remote-objects-message';
	$attrib['class'] = 'notice';
	$attrib['style'] = 'display: none';

	$msg = rcube::Q($RCMAIL->gettext('blockedimages')) . ' ';
	$msg .= html::a(array(
	'href' => "#loadimages",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-images')"
	),
	rcube::Q($RCMAIL->gettext('showimages')));

	// add link to save sender in addressbook and reload message
	if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
	$msg .= ' ' . html::a(array(
	'href' => "#alwaysload",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('always-load')",
	'style' => "white-space:nowrap"
	),
	rcube::Q($RCMAIL->gettext(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
	}

	$RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);

	return html::div($attrib, $msg);
	}

	function rcmail_message_buttons()
	{
	global $RCMAIL, $MESSAGE;

	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$dbox = $RCMAIL->config->get('drafts_mbox');

	// the message is not a draft
	if ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0) {
	return '';
	}

	$attrib['id'] = 'message-buttons';
	$attrib['class'] = 'notice';

	$msg = rcube::Q($RCMAIL->gettext('isdraft')) . ' ';
	$msg .= html::a(array(
	'href' => "#edit",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"
	),
	rcube::Q($RCMAIL->gettext('edit')));

	return html::div($attrib, $msg);
	}

	function rcmail_message_objects($attrib)
	{
	global $RCMAIL, $MESSAGE;

	if (!$attrib['id'])
	$attrib['id'] = 'message-objects';

	$content = array(
	rcmail_message_buttons(),
	rcmail_remote_objects_msg(),
	);

	$plugin = $RCMAIL->plugins->exec_hook('message_objects',
	array('content' => $content, 'message' => $MESSAGE));

	$content = implode("\n", $plugin['content']);

	return html::div($attrib, $content);
	}

	function rcmail_contact_exists($email)
	{
	global $RCMAIL;

	if ($email) {
	// @TODO: search in all address books?
	$CONTACTS = $RCMAIL->get_address_book(-1, true);

	if (is_object($CONTACTS)) {
	$existing = $CONTACTS->search('email', $email, true, false);
	if ($existing->count) {
	return true;
	}
	}
	}

	return false;
	}

	function rcmail_message_contactphoto($attrib)
	{
	global $RCMAIL, $MESSAGE;

	$placeholder = $attrib['placeholder'] ? $RCMAIL->output->abs_url($attrib['placeholder'], true) : null;
	$placeholder = $RCMAIL->output->asset_url($placeholder ? $placeholder : 'program/resources/blank.gif');

	if ($MESSAGE->sender) {
	$photo_img = $RCMAIL->url(array(
	'_task' => 'addressbook',
	'_action' => 'photo',
	'_email' => $MESSAGE->sender['mailto'],
	));

	$attrib['onerror'] = "this.src = '$placeholder'";
	}
	else {
	$photo_img = $placeholder;
	}

	return html::img(array('src' => $photo_img, 'alt' => $RCMAIL->gettext('contactphoto')) + $attrib);
	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Mar 19, 8:51 AM (21 h, 49 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 458522
Default Alt Text: (73 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions