X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=da3764c5656ad2420d22d486f7b94d6c31422a2f;hp=c7c5ed861032de48aeade5a50ebc4842ece3a9a2;hb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;hpb=7e1c2d41620f012a608ca3cdc7f1733ce4723f91;ds=sidebyside diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c7c5ed86..da3764c5 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -14,13 +14,27 @@ * $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_ent_id = $_GET['passed_ent_id']; +$passed_id = $_GET['passed_id']; +$mailbox = $_GET['mailbox']; +/* end globals */ $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); $mailbox = urldecode($mailbox); @@ -45,7 +59,11 @@ $subject = trim(decodeHeader($rfc822_header->subject)); $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++) { @@ -88,27 +106,27 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE ); echo "\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', htmlentities($from), 'left' ) + html_tag( 'td', htmlspecialchars($from), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlentities($subject), 'left' ) + html_tag( 'td', htmlspecialchars($subject), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Date").' ', 'left' ) . - html_tag( 'td', htmlentities($date), 'left' ) + html_tag( 'td', htmlspecialchars($date), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("To").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlentities($to), 'left' ) + 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','','valign="top"' ) . - html_tag( 'td', htmlentities($cc), 'left' ) + html_tag( 'td', htmlspecialchars($cc), 'left' ) ); } /* body */