X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fget.inc;h=42b52bfeb24af252d0f8a121fdd013cf33a49884;hb=8bb10dbda276f4c5f1050a05786ba5a5a6cc787d;hp=6322f707669450af52fc470ac041832c2656645f;hpb=0af63e79917234f76cfa7ec74e9d97b24fbf9b55;p=roundcube.git diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 6322f70..42b52bf 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -15,7 +15,7 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: get.inc 147 2006-02-20 23:29:14Z roundcube $ + $Id: get.inc 511 2007-03-19 22:36:24Z thomasb $ */ @@ -29,7 +29,7 @@ if ($_GET['_preload']) $message = rcube_label('loadingdata'); print "\n\n" . - '' . + '' . "\n\n" . $message . "\n\n"; @@ -37,23 +37,15 @@ if ($_GET['_preload']) } - // 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']); + $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']); } - // show part page if ($_GET['_frame']) { @@ -61,43 +53,27 @@ if ($_GET['_frame']) exit; } -else if ($_GET['_part']) +else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) { - if ($part = $MESSAGE['parts'][$_GET['_part']]); + 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']; - - if ($ctype_primary=='text' && $ctype_secondary=='html') - { - list($MESSAGE['parts']) = rcmail_parse_message($part, - 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 + // send download headers if ($_GET['_download']) { - // send download headers + header("Cache-Control: private", false); header("Content-Type: application/octet-stream"); - header(sprintf('Content-Disposition: attachment; filename="%s"', - $filename ? $filename : "roundcube.$ctype_secondary")); } 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'])) @@ -107,7 +83,37 @@ else if ($_GET['_part']) } // deliver part content - echo $cont; + 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 + { + header(sprintf('Content-Disposition: %s; filename="%s";', + $part->disposition ? $part->disposition : 'attachment', + $part->filename ? $part->filename : "roundcube.$ctype_secondary")); + + // turn off output buffering and print part content + $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true); + } + exit; } } @@ -127,34 +133,13 @@ else 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 = "\n\n\n"; + $cont .= rcmail_message_body(array()); + $cont .= "\n\n"; $OUTPUT = new rcube_html_page(); $OUTPUT->write($cont); -/* - if ($mimetype=='text/html') - print $cont; - else - { - print "\n\n"; - print $cont; - print "\n\n"; - } -*/ exit; }