From 6d5dbae53cd4b4b97da0b0c558292a7f1062a524 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 25 Jul 2008 11:13:15 -0400
Subject: [PATCH] Prefer File_Info over mime_content_type + detect mime type when uploading + some code style
---
program/steps/mail/get.inc | 158 ++++++++++++++++++++++------------------------------
1 files changed, 67 insertions(+), 91 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 018ae2e..842c605 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -5,8 +5,8 @@
| program/steps/mail/get.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Delivering a specific part of a mail message |
@@ -23,137 +23,113 @@
// 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='.$url.'">' .
+ '<meta http-equiv="refresh" content="0; url='.Q($url).'">' .
"\n</head>\n<body>" .
$message .
"\n</body>\n</html>";
exit;
- }
-
+}
// similar code as in program/steps/mail/show.inc
-if ($_GET['_uid'])
- {
- $MESSAGE = array();
- $MESSAGE['source'] = rcmail_message_source($_GET['_uid']);
-
- $mmd = new Mail_mimeDecode($MESSAGE['source']);
- $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
- 'decode_headers' => FALSE,
- 'decode_bodies' => FALSE));
-
- $MESSAGE['parts'] = $mmd->getMimeNumbers($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 ($_GET['_part'])
- {
- if ($part = $MESSAGE['parts'][$_GET['_part']]);
- {
+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);
- $filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];
-
- if ($ctype_primary=='text')
- {
- list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
- array('safe' => (bool)$_GET['_safe'],
- 'prefer_html' => TRUE,
- 'get_url' => $GET_URL.'&_part=%s'));
- $cont = rcmail_print_body($MESSAGE['parts'][0], (bool)$_GET['_safe']);
- }
- else
- $cont = $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']);
+ header("Expires: 0");
+ header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+ header("Cache-Control: private", false);
+ header("Content-Transfer-Encoding: binary");
- // send correct headers for content type and length
- if ($_GET['_download'])
- {
- // send download headers
+ // send download headers
+ if ($_GET['_download']) {
+ header("Cache-Control: private", false);
header("Content-Type: application/octet-stream");
- header(sprintf('Content-Disposition: attachment; filename="%s"',
- $filename ? $filename : "roundcube.$ctype_secondary"));
- }
+ }
+ else if ($ctype_primary == 'text')
+ header("Content-Type: text/$ctype_secondary; charset=" . RCMAIL_CHARSET);
else
- {
header("Content-Type: $mimetype");
- header(sprintf('Content-Disposition: inline; filename="%s"', $filename));
- }
- header(sprintf('Content-Length: %d', strlen($cont)));
+ // 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
- echo $cont;
- exit;
+ 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);
+
+ $OUTPUT = new rcube_html_page();
+ $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"));
+
+ // turn off output buffering and print part content
+ $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'));
-
- if ($MESSAGE['parts'] && $ctype_primary=='multipart')
- {
- // reset output page
- $OUTPUT = new rcube_html_page();
- parse_template('messagepart');
- exit;
- }
- else if ($MESSAGE['parts'][0])
- {
- $part = $MESSAGE['parts'][0];
- $cont = rcmail_print_body($part, (bool)$_GET['_safe']);
- }
- else
- $cont = $IMAP->get_body($_GET['_uid']);
+ $cont = "<html>\n<head><title></title>\n</head>\n<body>";
+ $cont .= rcmail_message_body(array());
+ $cont .= "\n</body>\n</html>";
$OUTPUT = new rcube_html_page();
$OUTPUT->write($cont);
-/*
- if ($mimetype=='text/html')
- print $cont;
- else
- {
- print "<html>\n<body>\n";
- print $cont;
- print "\n</body>\n</html>";
- }
-*/
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