* $Id$
*/
-require_once('../src/validate.php');
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../src/load_prefs.php');
-require_once('../functions/imap.php');
-require_once('../functions/page_header.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/html.php');
+
+/* get some of these globals */
+$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+
+$passed_id = (int) $_GET['passed_id'];
+$mailbox = $_GET['mailbox'];
+/* end globals */
$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
+$mailbox = urldecode($mailbox);
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+sqimap_mailbox_select($imapConnection, $mailbox);
+$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+$id = $passed_id;
+if (isset($passed_ent_id)) {
+ $message = $message->getEntity($passed_ent_id);
+}
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imap_stream, $mailbox);
-$message = sqimap_get_message($imap_stream, $passed_id, $mailbox);
/* --start display setup-- */
+$rfc822_header = $message->rfc822_header;
/* From and Date are usually fine as they are... */
-$from = decodeHeader($message->header->from);
-$date = getLongDateString($message->header->date);
+$from = decodeHeader($rfc822_header->getAddr_s('from'));
+$date = getLongDateString($rfc822_header->date);
+$subject = trim(decodeHeader($rfc822_header->subject));
/* we can clean these up if the list is too long... */
-$cc = decodeHeader(getLineOfAddrs($message->header->cc));
-$to = decodeHeader(getLineOfAddrs($message->header->to));
-
-/* and Body and Subject could easily stream off the page... */
-$id = $message->header->id;
-$ent_ar = findDisplayEntity ($message, 0);
-$ent_num = $ent_ar[0];
-
-$body_message = getEntity($message, $ent_num);
-if (($body_message->header->type0 == 'text') ||
- ($body_message->header->type0 == 'rfc822')) {
- $body = mime_fetch_body ($imap_stream, $id, $ent_num);
- $body = decodeBody($body, $body_message->header->encoding);
- $hookResults = do_hook('message_body', $body);
- $body = $hookResults[1];
- if ($body_message->header->type1 == 'html') {
- if( $show_html_default <> 1 ) {
- $body = strip_tags( $body );
- translateText($body, $wrap_at, $body_message->header->charset);
- } else {
- $body = MagicHTML( $body, $id, $message );
- }
- } else {
- translateText($body, $wrap_at, $body_message->header->charset);
- }
+$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
+$to = decodeHeader($rfc822_header->getAddr_s('to'));
+
+if ($show_html_default == 1) {
+ $ent_ar = $message->findDisplayEntity(array());
} else {
- $body = _("Message not printable");
+ $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
+$body = '';
+if ($ent_ar[0] != '') {
+ for ($i = 0; $i < count($ent_ar); $i++) {
+ $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
+ $body .= '<hr noshade size=1>';
+ }
+ $hookResults = do_hook('message_body', $body);
+ $body = $hookResults[1];
+} else {
+ $body = _("Message not printable");
}
-
-$subject = trim(decodeHeader($message->header->subject));
/* now, if they choose to, we clean up the display a bit... */
- /*
+
if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
$num_leading_spaces = 9; // nine leading spaces for indentation
$to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
// the body should have no leading zeros
- $body = pf_clean_string($body, 0);
+ // disabled because it destroys html mail
+
+// $body = pf_clean_string($body, 0);
// clean up everything else...
$subject = pf_clean_string($subject, $num_leading_spaces);
$date = pf_clean_string($date, $num_leading_spaces);
} // end cleanup
-*/
+
// --end display setup--
echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
/* headers (we use table because translations are not all the same width) */
- html_tag( 'table', '', '', '', 'width="100%" cellspacing="0" cellpadding="0" border="0"' ) .
+ html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0" width="100%"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
+ html_tag( 'td', htmlspecialchars($from), 'left' )
+ ) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("From"), 'left' ) .
- html_tag( 'td', htmlentities($from), 'left' )
+ html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($subject), 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("To"), 'left' ) .
- html_tag( 'td', htmlentities($to), 'left' )
+ html_tag( 'td', _("Date").' ', 'left' ) .
+ html_tag( 'td', htmlspecialchars($date), 'left' )
+ ) . "\n" .
+ html_tag( 'tr',
+ html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($to), 'left' )
) . "\n";
if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
echo html_tag( 'tr',
- html_tag( 'td', _("CC"), 'left' ) .
- html_tag( 'td', htmlentities($cc), 'left' )
+ html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($cc), 'left' )
);
}
- echo html_tag( 'tr',
- html_tag( 'td', _("Date"), 'left' ) .
- html_tag( 'td', htmlentities($date), 'left' )
- ) . "\n" .
- html_tag( 'tr',
- html_tag( 'td', _("Subject"), 'left' ) .
- html_tag( 'td', htmlentities($subject), 'left' )
- ) . "\n" .
-
/* body */
- html_tag( 'tr',
+ echo html_tag( 'tr',
html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
) . "\n" .