summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-08-22 09:58:48 +0000
committerthomascube <thomas@roundcube.net>2008-08-22 09:58:48 +0000
commit0ced2b9ac03e425750a76dea3ed59156b2709b4c (patch)
tree6e32f4f6e6d9f7a563a86b338c71bcc9c61c37ea
parentf74b283fd47429add5955577a9e06ae5b34803c1 (diff)
Revert r1670 but improve part download step by fixing headers and adding set_time_limit(0)
-rw-r--r--program/include/rcube_browser.php4
-rw-r--r--program/steps/mail/get.inc36
2 files changed, 18 insertions, 22 deletions
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index af393d63e..0d4766417 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -38,11 +38,11 @@ class rcube_browser
$this->linux = stristr($HTTP_USER_AGENT, 'linux');
$this->unix = stristr($HTTP_USER_AGENT, 'unix');
+ $this->opera = stristr($HTTP_USER_AGENT, 'opera');
$this->ns4 = stristr($HTTP_USER_AGENT, 'mozilla/4') && !stristr($HTTP_USER_AGENT, 'msie');
$this->ns = ($this->ns4 || stristr($HTTP_USER_AGENT, 'netscape'));
- $this->ie = stristr($HTTP_USER_AGENT, 'msie');
+ $this->ie = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera;
$this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5');
- $this->opera = stristr($HTTP_USER_AGENT, 'opera');
$this->safari = stristr($HTTP_USER_AGENT, 'safari');
if ($this->ns) {
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 22658346e..b95784f19 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -54,6 +54,8 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
$ctype_primary = strtolower($part->ctype_primary);
$ctype_secondary = strtolower($part->ctype_secondary);
$mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+
+ $browser = new rcube_browser;
header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@@ -62,11 +64,12 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
// send download headers
if ($_GET['_download']) {
- header("Cache-Control: private", false);
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=" . RCMAIL_CHARSET);
+ header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET));
else
header("Content-Type: $mimetype");
@@ -78,20 +81,6 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
// 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];
- */
-
// get part body if not available
if (!$part->body)
$part->body = $MESSAGE->get_part_content($part->mime_id);
@@ -100,10 +89,17 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
$OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
}
else {
- header(sprintf('Content-Length: %d', $part->size));
- 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.
+ if (!ini_get('safe_mode')) {
+ set_time_limit(0);
+ }
+
+ $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
+ $filename = abbreviate_string($part->filename, 55);
+ $filename = $browser->ie ? rawurlencode($filename) : addslashes($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);