From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/steps/mail/get.inc | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index b77621b..07af755 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-2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
| 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,15 +73,14 @@
}
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;
- send_nocacheing_headers();
-
+ $browser = $RCMAIL->output->browser;
+
// send download headers
if ($_GET['_download']) {
header("Content-Type: application/octet-stream");
@@ -74,7 +96,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);
@@ -84,18 +106,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 = ($browser->ie && $browser->ver < 7) ? rawurlencode(abbreviate_string($filename, 55)) : addcslashes($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;
@@ -122,4 +153,4 @@
header('HTTP/1.1 404 Not Found');
exit;
-?>
+
--
Gitblit v1.9.1