githubFork/roundcubemail.git

			@@ -5,8 +5,11 @@
			\| program/steps/mail/get.inc \|
			\| \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
			\| Licensed under the GNU GPL \|
			\| Copyright (C) 2005-2011, 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 \|
			@@ -22,7 +25,7 @@

			// show loading page
			if (!empty($_GET['_preload'])) {
			$url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
			$url = preg_replace('/[&?]+_preload=1/', '', $_SERVER['REQUEST_URI']);
			$message = rcube_label('loadingdata');

			header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
			@@ -36,7 +39,7 @@
			ob_end_clean();

			// Now we need IMAP connection
			if (!$RCMAIL->imap_connect()) {
			if (!$RCMAIL->storage_connect()) {
			// Get action is often executed simultanously.
			// Some servers have MAXPERIP or other limits.
			// To workaround this we'll wait for some time
			@@ -66,11 +69,14 @@

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

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

			else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
			else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {

			if ($part = $MESSAGE->mime_parts[$pid]) {
			$ctype_primary = strtolower($part->ctype_primary);
			@@ -79,7 +85,7 @@

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

			if ($plugin['abort'])
			exit;
			@@ -109,18 +115,30 @@

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

			$out = rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false));
			}

			$OUTPUT = new rcube_html_page();
			$OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
			$OUTPUT->write($out);
			}
			else {
			// don't kill the connection if download takes more than 30 sec.
			@set_time_limit(0);

			$filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
			$ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
			$filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
			$filename = preg_replace('[\r\n]', '', $filename);

			if ($browser->ie && $browser->ver < 7)
			@@ -132,13 +150,33 @@

			$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);
			}

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

			// turn off output buffering and print part content
			if ($part->body)
			echo $part->body;
			else if ($part->size)
			$IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			// do content filtering to avoid XSS through fake images
			if (!empty($_REQUEST['_embed']) && $browser->ie && $browser->ver <= 8) {
			if ($part->body)
			echo preg_match('/<(script\|iframe\|object)/i', $part->body) ? '' : $part->body;
			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');
			$RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, false, $stdout);
			}
			}
			else {
			// turn off output buffering and print part content
			if ($part->body)
			echo $part->body;
			else if ($part->size)
			$RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			}
			}

			exit;