githubFork/roundcubemail.git

			@@ -4,8 +4,8 @@
			+-----------------------------------------------------------------------+
			\| program/steps/mail/get.inc \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -19,22 +19,44 @@

			*/

			require_once('Mail/mimeDecode.php');


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

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

			ob_end_clean();

			// Now we need IMAP connection
			if (!$RCMAIL->imap_connect()) {
			// 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 {
			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;
			}

			// similar code as in program/steps/mail/show.inc
			if (!empty($_GET['_uid'])) {
			@@ -42,6 +64,7 @@
			$MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
			}

			send_nocacheing_headers();

			// show part page
			if (!empty($_GET['_frame'])) {
			@@ -50,17 +73,13 @@
			}

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

			if ($part = $MESSAGE->mime_parts[$pid]) {
			$ctype_primary = strtolower($part->ctype_primary);
			$ctype_secondary = strtolower($part->ctype_secondary);
			$mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);

			$browser = new rcube_browser;

			header("Expires: 0");
			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
			header("Cache-Control: private", false);
			header("Content-Transfer-Encoding: binary");
			$browser = $RCMAIL->output->browser;

			// send download headers
			if ($_GET['_download']) {
			@@ -68,19 +87,17 @@
			if ($browser->ie)
			header("Content-Type: application/force-download");
			}
			else if ($ctype_primary == 'text')
			else if ($ctype_primary == 'text') {
			header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET));
			else
			}
			else {
			$mimetype = rcmail_fix_mimetype($mimetype);
			header("Content-Type: $mimetype");

			// We need to set the following headers to make downloads work using IE in HTTPS mode.
			if (isset($_SERVER['HTTPS'])) {
			header('Pragma: ');
			header('Cache-Control: ');
			header("Content-Transfer-Encoding: binary");
			}

			// deliver part content
			if ($ctype_primary == 'text' && $ctype_secondary == 'html') {
			if ($ctype_primary == 'text' && $ctype_secondary == 'html' && empty($_GET['_download'])) {
			// get part body if not available
			if (!$part->body)
			$part->body = $MESSAGE->get_part_content($part->mime_id);
			@@ -90,19 +107,27 @@
			}
			else {
			// don't kill the connection if download takes more than 30 sec.
			if (!ini_get('safe_mode')) {
			set_time_limit(0);
			}

			@set_time_limit(0);

			$filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
			$filename = abbreviate_string($part->filename, 55);
			$filename = $browser->ie ? rawurlencode($filename) : addslashes($filename);
			$filename = preg_replace('[\r\n]', '', $filename);

			if ($browser->ie && $browser->ver < 7)
			$filename = rawurlencode(abbreviate_string($filename, 55));
			else if ($browser->ie)
			$filename = rawurlencode($filename);
			else
			$filename = addcslashes($filename, '"');

			$disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';


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

			// turn off output buffering and print part content
			$IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			if ($part->body)
			echo $part->body;
			else if ($part->size)
			$IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			}

			exit;
			@@ -129,4 +154,4 @@
			header('HTTP/1.1 404 Not Found');
			exit;

			?>