**
** $Id$
**/
+
+ if (defined('mime_php'))
+ return;
+ define('mime_php', true);
+ global $debug_mime;
$debug_mime = false;
- $mime_php = true;
-
- if (!isset($i18n_php))
- include "../functions/i18n.php";
- if (!isset($imap_php))
- include "../functions/imap.php";
- if (!isset($config_php))
- include "../config/config.php";
-
+
+ include "../functions/imap.php";
/** Setting up the objects that have the structure for the message **/
fputs ($imap_stream, "a010 FETCH $id BODY[$ent_id]\r\n");
$data = sqimap_read_data ($imap_stream, 'a010', true, $response, $message);
$topline = array_shift($data);
- while (! ereg('\\* [0-9]+ FETCH ', $topline) && data)
+ while (! ereg('\\* [0-9]+ FETCH ', $topline) && $data)
$topline = array_shift($data);
$wholemessage = implode('', $data);
global $show_html_default;
if (! $message)
- return;
+ return 0;
// Show text/plain or text/html -- the first one we find.
if ($message->header->type0 == 'text' &&
($message->header->type1 == 'plain' ||
- $message->header->type2 == 'html'))
+ $message->header->type1 == 'html'))
{
// If the next part is an HTML version, this will
// all be true. Show it, if the user so desires.
$textOnly == 0 &&
$next->header->type0 == "text" &&
$next->header->type1 == "html" &&
- $next->header->entity_id == 2 &&
+ ($next->header->entity_id == 2 ||
+ $next->header->entity_id == 1.2) &&
$message->header->type1 == "plain" &&
isset($show_html_default) &&
$show_html_default)
}
else
{
- for ($i=0; $message->entities[$i]; $i++)
+ for ($i=0; isset($message->entities[$i]); $i++)
{
$next = 'none';
if (isset($message->entities[$i + 1]))
translateText($body, $wrap_at, $body_message->header->charset);
}
- $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
+ $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox&showHeaders=1\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
/** Display the ATTACHMENTS: message if there's more than one part **/
$body .= "</TD></TR></TABLE>";
if (isset($message->entities[0])) {
$body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
}
+ $body .= "</TD></TR></TABLE>";
} else {
- $body .= formatAttachments ($message, -1, $message->header->mailbox, $id);
+ $body = formatAttachments ($message, -1, $message->header->mailbox, $id);
}
return $body;
}