* $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');
$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
$mailbox = urldecode($mailbox);
/* --start display setup-- */
-
+$rfc822_header = $message->rfc822_header;
/* From and Date are usually fine as they are... */
-$from = decodeHeader($message->header->getAddr_s('from'));
-$date = getLongDateString($message->header->date);
-$subject = trim(decodeHeader($message->header->subject));
+$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($message->header->getAddr_s('cc'));
-$to = decodeHeader($message->header->getAddr_s('to'));
+$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
+$to = decodeHeader($rfc822_header->getAddr_s('to'));
-$ent_ar = $message->findDisplayEntity();
+if ($show_html_default == 1) {
+ $ent_ar = $message->findDisplayEntity(array());
+} else {
+ $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
$body = '';
if ($ent_ar[0] != '') {
for ($i = 0; $i < count($ent_ar); $i++) {
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"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
+ html_tag( 'td', htmlspecialchars($from), 'left' )
+ ) . "\n" .
+ html_tag( 'tr',
+ html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($subject), 'left' )
+ ) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("From"), 'left' ) .
- html_tag( 'td', htmlentities($from), 'left' )
+ html_tag( 'td', _("Date").' ', 'left' ) .
+ html_tag( 'td', htmlspecialchars($date), 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("To"), 'left' ) .
- html_tag( 'td', htmlentities($to), 'left' )
+ 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" .