X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=2f0839d8a0ecbe5172f54ca89341d65bc24291b8;hb=88d916ee496df4d2bc62da432048fb9f567d72b5;hp=88fdaf90fce5e0dc1255b75a6dfed1b3f2644db5;hpb=83be314a29726be91884b222e4c136f9abade9de;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 88fdaf90..2f0839d8 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,7 +106,7 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE ); echo "\n" . /* headers (we use table because translations are not all the same width) */ - html_tag( 'table', '', 'center', '', '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' )