X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fget.inc;h=bf35d0178202fde1ac2f77c0e96bf3729b821c0e;hb=a2dd2e41259a5e90016efcd7d083020b95e25527;hp=27c61c71340963208e46a1a0a2aa84b7388e134b;hpb=48e8459231a1efa3e97284d07a328776a5b7485b;p=roundcube.git diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 27c61c7..bf35d01 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -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: | @@ -15,26 +15,48 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: get.inc 1400 2008-05-17 17:46:43Z thomasb $ + $Id: get.inc 5151 2011-08-31 12:49:44Z alec $ */ -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 "\n\n" . - '' . - "\n\n" . - $message . - "\n\n"; + header('Content-Type: text/html; charset=' . RCMAIL_CHARSET); + print "\n\n" + . '' . "\n" + . '' . "\n" + . "\n\n$message\n\n"; 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 @@ if (!empty($_GET['_uid'])) { $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET)); } +send_nocacheing_headers(); // show part page if (!empty($_GET['_frame'])) { @@ -50,60 +73,74 @@ if (!empty($_GET['_frame'])) { } 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); - header("Expires: 0"); - header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); - header("Cache-Control: private", false); - header("Content-Transfer-Encoding: binary"); + // 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']))); + + if ($plugin['abort']) + exit; + + // overwrite modified vars from plugin + $mimetype = $plugin['mimetype']; + list($ctype_primary, $ctype_secondary) = explode('/', $mimetype); + if ($plugin['body']) + $part->body = $plugin['body']; + + $browser = $RCMAIL->output->browser; // send download headers - if ($_GET['_download']) { - header("Cache-Control: private", false); + if ($plugin['download']) { header("Content-Type: application/octet-stream"); + if ($browser->ie) + header("Content-Type: application/force-download"); } - else + else if ($ctype_primary == 'text') { + header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET)); + } + 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') { - // we have to analyze the whole structure again to find inline objects - /* what was this good for again ? - list($new_parts, $new_attachments) = - rcmail_parse_message($MESSAGE['structure'], - array('safe' => intval($_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]; - */ - + 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); $OUTPUT = new rcube_html_page(); - $OUTPUT->write(rcmail_print_body($part, $MESSAGE->is_safe)); + $OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false))); } else { - header(sprintf('Content-Disposition: %s; filename="%s";', - $_GET['_download'] ? 'attachment' : 'inline', - $part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary")); + // 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; + $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($plugin['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; @@ -130,4 +167,4 @@ else { header('HTTP/1.1 404 Not Found'); exit; -?> +