/**
* mime.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains the functions necessary to detect and decode MIME
/* Isolate the body structure and remove beginning and end parenthesis. */
$read = trim(substr ($bodystructure, strpos(strtolower($bodystructure), 'bodystructure') + 13));
$read = trim(substr ($read, 0, -1));
- $msg =& new Message();
- $res = $msg->parseStructure($read);
- $msg = $res[0];
+ $i = 0;
+ $msg = Message::parseStructure($read,$i);
if (!is_object($msg)) {
include_once(SM_PATH . 'functions/display_messages.php');
global $color, $mailbox;
displayPageHeader( $color, urldecode($mailbox) );
echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n\n" .
'<CENTER>';
- $errormessage = _("Squirrelmail could not decode the bodystructure of the message");
+ $errormessage = _("SquirrelMail could not decode the bodystructure of the message");
$errormessage .= '<BR>'._("the provided bodystructure by your imap-server").':<BR><BR>';
$errormessage .= '<table><tr><td>' . htmlspecialchars($read) . '</td></tr></table>';
plain_error_message( $errormessage, $color );
echo '</body></html>';
exit;
}
- $msg->setEnt('0');
if (count($flags)) {
foreach ($flags as $flag) {
$char = strtoupper($flag{1});
return $msg;
}
+
+
/* This starts the parsing of a particular structure. It is called recursively,
* so it can be passed different structures. It returns an object of type
* $message.
* to mime_get_elements()
*/
-function mime_fetch_body($imap_stream, $id, $ent_id) {
+function mime_fetch_body($imap_stream, $id, $ent_id=1) {
global $uid_support;
/* Do a bit of error correction. If we couldn't find the entity id, just guess
* that it is the first one. That is usually the case anyway.
*/
if (!$ent_id) {
- $ent_id = 1;
+ $cmd = "FETCH $id BODY[]";
+ } else {
+ $cmd = "FETCH $id BODY[$ent_id]";
}
- $cmd = "FETCH $id BODY[$ent_id]";
$data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message, $uid_support);
do {
return $ret;
}
-function mime_print_body_lines ($imap_stream, $id, $ent_id, $encoding) {
+function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) {
global $uid_support;
- /* Do a bit of error correction. If we couldn't find the entity id, just guess
- * that it is the first one. That is usually the case anyway.
- */
- if (!$ent_id) {
- $ent_id = 1;
- }
+
$sid = sqimap_session_id($uid_support);
/* Don't kill the connection if the browser is over a dialup
* and it would take over 30 seconds to download it.
* order that is their priority.
*/
global $startMessage, $username, $key, $imapServerAddress, $imapPort,
- $show_html_default, $has_unsafe_images, $view_unsafe_images, $sort;
+ $show_html_default, $sort, $has_unsafe_images, $passed_ent_id;
+
+ if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+ $view_unsafe_images = false;
+ }
- $has_unsafe_images= 0;
$body = '';
$urlmailbox = urlencode($mailbox);
$body_message = getEntity($message, $ent_num);
translateText($body, $wrap_at,
$body_message->header->getParameter('charset'));
}
-
- if ($has_unsafe_images) {
- if ($view_unsafe_images) {
- $untext = '">' . _("Hide Unsafe Images");
- } else {
- $untext = '&view_unsafe_images=1">' . _("View Unsafe Images");
- }
- $body .= '<center><small><a href="read_body.php?passed_id=' . $id .
- '&passed_ent_id=' . $message->entity_id . '&mailbox=' . $urlmailbox .
- '&sort=' . $sort . '&startMessage=' . $startMessage . '&show_more=0' .
- $untext . '</a></small></center><br>' . "\n";
+ $link = 'read_body.php?passed_id=' . $id . '&ent_id='.$ent_num.
+ '&mailbox=' . $urlmailbox .'&sort=' . $sort .
+ '&startMessage=' . $startMessage . '&show_more=0';
+ if (isset($passed_ent_id)) {
+ $link .= '&passed_ent_id='.$passed_ent_id;
+ }
+ if ($view_unsafe_images) {
+ $text = _("Hide Unsafe Images");
+ } else {
+ if (isset($has_unsafe_images) && $has_unsafe_images) {
+ $link .= '&view_unsafe_images=1';
+ $text = _("View Unsafe Images");
+ } else {
+ $text = '';
+ }
}
+ $body .= '<center><small><a href="'.$link.'">'.$text.
+ '</a></small></center><br>' . "\n";
}
return $body;
}
$default_page = '../src/read_body.php';
$rfc822_header = $att->rfc822_header;
$filename = decodeHeader($rfc822_header->subject);
-
+ if (trim( $filename ) == '') {
+ $filename = 'untitled-[' . $ent . ']' ;
+ }
$from_o = $rfc822_header->from;
if (is_object($from_o)) {
$from_name = $from_o->getAddress(false);
if (trim($filename) == '') {
$name = decodeHeader($header->disposition->getProperty('name'));
if (trim($name) == '') {
- if (trim( $header->id ) == '') {
- $filename = 'untitled-[' . $ent . ']' ;
+ $name = decodeHeader($header->getParameter('name'));
+ if(trim($name) == '') {
+ if (trim( $header->id ) == '') {
+ $filename = 'untitled-[' . $ent . ']' ;
+ } else {
+ $filename = 'cid: ' . $header->id;
+ }
} else {
- $filename = 'cid: ' . $header->id;
+ $filename = $name;
}
} else {
$filename = $name;
}
}
} else {
- if (trim( $header->id ) == '') {
- $filename = 'untitled-[' . $ent . ']' ;
- } else {
- $filename = 'cid: ' . $header->id;
- }
- }
-
+ $filename = decodeHeader($header->getParameter('name'));
+ if (!trim($filename)) {
+ if (trim( $header->id ) == '') {
+ $filename = 'untitled-[' . $ent . ']' ;
+ } else {
+ $filename = 'cid: ' . $header->id;
+ }
+ }
+ }
if ($header->description) {
$description = htmlspecialchars($header->description);
} else {
}
$defaultlink = $default_page . "?startMessage=$startMessage"
. "&passed_id=$id&mailbox=$urlMailbox"
- . '&ent_id='.$ent.$passed_ent_id_link;
+ . '&ent_id='.$ent.$passed_ent_id_link.'&absolute_dl=true';
if ($where && $what) {
$defaultlink .= '&where='. urlencode($where).'&what='.urlencode($what);
}
$defaultlink = $hookresults[6];
$attachments .= '<TR><TD>' .
- "<A HREF=\"$defaultlink\">$display_filename</A> </TD>" .
+ '<A HREF="'.$defaultlink.'">'.htmlspecialchars($display_filename).'</A> </TD>' .
'<TD><SMALL><b>' . show_readable_size($header->size) .
'</b> </small></TD>' .
"<TD><SMALL>[ $type0/$type1 ] </SMALL></TD>" .
if (ucfirst($res[4]) == 'B') {
$replace = base64_decode($res[5]);
+ $replace = charset_decode($res[3],$replace);
+
} else {
$replace = str_replace('_', ' ', $res[5]);
$replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))',
* @param $id the id of the message
* @return a string with html safe to display in the browser.
*/
-function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
+function magicHTML($body, $id, $message, $mailbox = 'INBOX') {
global $attachment_common_show_images, $view_unsafe_images,
$has_unsafe_images;
/**
"head",
"base",
"link",
- "frame",
- "iframe"
+ "frame",
+ "iframe"
);
$rm_tags_with_content = Array(
)
)
);
+ if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+ $view_unsafe_images = false;
+ }
if (!$view_unsafe_images){
/**
* Remove any references to http/https if view_unsafe_images set