githubFork/roundcubemail.git

			@@ -25,14 +25,15 @@
			$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();

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

			send_nocacheing_headers();

			// show part page
			if (!empty($_GET['_frame'])) {
			@@ -48,16 +50,7 @@
			}

			else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
			// TNEF encoded attachment part
			if (preg_match('/^winmail\.([0-9.]+)\.([0-9]+)$/', $pid, $nt)) {
			$pid = $nt[1]; $i = $nt[2];
			if ($part = $MESSAGE->mime_parts[$pid]) {
			$tnef_arr = $IMAP->tnef_decode($part, $MESSAGE->uid);
			if (is_a($tnef_arr[$i], 'rcube_message_part'))
			$MESSAGE->mime_parts[$pid] = $tnef_arr[$i];
			}
			}


			if ($part = $MESSAGE->mime_parts[$pid]) {
			$ctype_primary = strtolower($part->ctype_primary);
			$ctype_secondary = strtolower($part->ctype_secondary);
			@@ -65,8 +58,6 @@

			$browser = new rcube_browser;

			send_nocacheing_headers();

			// send download headers
			if ($_GET['_download']) {
			header("Content-Type: application/octet-stream");
			@@ -82,7 +73,7 @@
			}

			// 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);
			@@ -92,9 +83,7 @@
			}
			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;

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

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

			?>