githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/steps/mail/get.inc \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005, RoundCube Dev. - Switzerland \|
			\| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -29,7 +29,7 @@
			$message = rcube_label('loadingdata');

			print "<html>\n<head>\n" .
			'<meta http-equiv="refresh" content="0; url='.htmlspecialchars($url).'">' .
			'<meta http-equiv="refresh" content="0; url='.Q($url).'">' .
			"\n</head>\n<body>" .
			$message .
			"\n</body>\n</html>";
			@@ -55,27 +55,25 @@

			else if ($pid = get_input_value('_part', RCUBE_INPUT_GET))
			{
			if ($part = $MESSAGE['parts'][$pid]);
			if ($part = $MESSAGE['parts'][$pid])
			{
			$ctype_primary = strtolower($part->ctype_primary);
			$ctype_secondary = strtolower($part->ctype_secondary);

			$mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
			$filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];

			// send correct headers for content type and length
			header("Expires: 0");
			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
			header("Cache-Control: private", false);
			header("Content-Transfer-Encoding: binary");

			// send download headers
			if ($_GET['_download'])
			{
			// send download headers
			header("Cache-Control: private", false);
			header("Content-Type: application/octet-stream");
			header(sprintf('Content-Disposition: attachment; filename="%s"',
			$filename ? rcube_imap::decode_mime_string($filename) : "roundcube.$ctype_secondary"));
			}
			else
			{
			header("Content-Type: $mimetype");
			header(sprintf('Content-Disposition: inline; filename="%s"', rcube_imap::decode_mime_string($filename)));
			}

			// We need to set the following headers to make downloads work using IE in HTTPS mode.
			if (isset($_SERVER['HTTPS']))
			@@ -90,7 +88,7 @@
			// we have to analyze the whole structure again to find inline objects
			list($new_parts, $new_attachments) =
			rcmail_parse_message($MESSAGE['structure'],
			array('safe' => (bool)$_GET['_safe'],
			array('safe' => intval($_GET['_safe']),
			'prefer_html' => TRUE,
			'get_url' => $GET_URL.'&_part=%s'));

			@@ -104,12 +102,16 @@
			$part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);

			$OUTPUT = new rcube_html_page();
			$OUTPUT->write(rcmail_print_body($part, (bool)$_GET['_safe']));
			$OUTPUT->write(rcmail_print_body($part, intval($_GET['_safe'])));
			}
			else
			{
			header(sprintf('Content-Disposition: %s; filename="%s";',
			$_GET['_download'] ? 'attachment' : 'inline',
			$part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary"));

			// turn off output buffering and print part content
			$IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
			$IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part, true);
			}

			exit;
			@@ -128,7 +130,7 @@

			$cont = '';
			list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
			array('safe' => (bool)$_GET['_safe'],
			array('safe' => intval($_GET['_safe']),
			'get_url' => $GET_URL.'&_part=%s'));

			$cont = "<html>\n<head><title></title>\n</head>\n<body>";
			@@ -146,4 +148,4 @@
			header('HTTP/1.1 404 Not Found');
			exit;

			?>
			?>