From 35f40fbda78a02a765c5efab41e1b8444257389c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 04 Sep 2009 06:38:18 -0400
Subject: [PATCH] Set timeout for attachment loading back to 0
---
program/steps/mail/get.inc | 183 ++++++++++++++++++++++-----------------------
1 files changed, 89 insertions(+), 94 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 995a485..40ce14e 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -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-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,117 +19,112 @@
*/
-require_once('Mail/mimeDecode.php');
-
// show loading page
-if ($_GET['_preload'])
- {
+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='.htmlspecialchars($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 ($_GET['_uid'])
- {
- $MESSAGE = array('UID' => get_input_value('_uid', RCUBE_INPUT_GET));
- $MESSAGE['structure'] = $IMAP->get_structure($MESSAGE['UID']);
- $MESSAGE['parts'] = $IMAP->get_mime_numbers($MESSAGE['structure']);
- }
+if (!empty($_GET['_uid'])) {
+ $RCMAIL->config->set('prefer_html', true);
+ $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
+}
// show part page
-if ($_GET['_frame'])
- {
- parse_template('messagepart');
+if (!empty($_GET['_frame'])) {
+ $OUTPUT->send('messagepart');
exit;
- }
+}
-else if ($pid = get_input_value('_part', RCUBE_INPUT_GET))
- {
- 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
- if ($_GET['_download'])
- {
- // send download headers
- 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']))
- {
- header('Pragma: ');
- header('Cache-Control: ');
- }
-
- // deliver part content
- if ($ctype_primary=='text' && $ctype_secondary=='html')
- {
- // 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'],
- 'prefer_html' => TRUE,
- 'get_url' => $GET_URL.'&_part=%s'));
-
- $all_parts = array_merge($new_parts, $new_attachments);
- for ($partix = 0; $partix < sizeof($all_parts); $partix++)
- if ($all_parts[$partix]->mime_id == $pid)
- $part = &$all_parts[$partix];
-
- // get part body if not available
- if (!$part->body)
- $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']));
- }
- else
- {
- // turn off output buffering and print part content
- $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
- }
-
- exit;
+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);
+ $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+
+ $browser = new rcube_browser;
+
+ send_nocacheing_headers();
+
+ // send download headers
+ if ($_GET['_download']) {
+ header("Content-Type: application/octet-stream");
+ if ($browser->ie)
+ header("Content-Type: application/force-download");
+ }
+ else if ($ctype_primary == 'text') {
+ header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET));
+ }
+ else {
+ header("Content-Type: $mimetype");
+ header("Content-Transfer-Encoding: binary");
+ }
+
+ // deliver part content
+ if ($ctype_primary == 'text' && $ctype_secondary == 'html') {
+ // get part body if not available
+ if (!$part->body)
+ $part->body = $MESSAGE->get_part_content($part->mime_id);
+
+ $OUTPUT = new rcube_html_page();
+ $OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
+ }
+ else {
+ // don't kill the connection if download takes more than 30 sec.
+ if (!ini_get('safe_mode')) {
+ set_time_limit(0);
+ }
+
+ $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
+
+ 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
+ if ($part->body)
+ echo $part->body;
+ else if ($part->size)
+ $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
+ }
+
+ exit;
+ }
+}
// print message
-else
- {
- $ctype_primary = strtolower($MESSAGE['structure']->ctype_primary);
- $ctype_secondary = strtolower($MESSAGE['structure']->ctype_secondary);
- $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
-
+else {
// send correct headers for content type
header("Content-Type: text/html");
-
- $cont = '';
- list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
- array('safe' => (bool)$_GET['_safe'],
- 'get_url' => $GET_URL.'&_part=%s'));
$cont = "<html>\n<head><title></title>\n</head>\n<body>";
$cont .= rcmail_message_body(array());
@@ -139,11 +134,11 @@
$OUTPUT->write($cont);
exit;
- }
+}
// if we arrive here, the requested part was not found
header('HTTP/1.1 404 Not Found');
exit;
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1