From 1c6634780266caff6f27c3210d1375cf538002d2 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Tue, 25 Jun 2002 11:42:11 +0000 Subject: [PATCH] r2l by Yoav git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3008 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/printer_friendly_bottom.php | 46 +++++++++++++++++++++++---------- src/printer_friendly_top.php | 18 +++++++------ 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 0c8cc2bf..a153979c 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -20,6 +20,7 @@ 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'); $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); @@ -93,23 +94,40 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE ); echo "\n" . /* headers (we use table because translations are not all the same width) */ - ''. - '\n". - '\n"; -if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */ - echo '\n"; -} -echo '\n". - '\n". - '

' . _("From") . ':	' . htmlentities($from) . "
' . _("To") . ':	' . htmlentities($to) . "
' . _("CC") . ':	' . htmlentities($cc) . "
' . _("Date") . ':	' . htmlentities($date) . "
' . _("Subject") . ':	' . htmlentities($subject) . "

'. - "\n"; -/* body */ -echo "

\n"; -echo $body; + html_tag( 'table', '', '', '', 'width="100%" cellspacing="0" cellpadding="0" border="0"' ) . + html_tag( 'tr', + html_tag( 'td', _("From"), 'left' ) . + html_tag( 'td', htmlentities($from), 'left' ) + ) . "\n" . + html_tag( 'tr', + html_tag( 'td', _("To"), 'left' ) . + html_tag( 'td', htmlentities($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' ) + ); + } + 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', + html_tag( 'td', '

' . "\n" . $body, 'left', '', 'colspan="2"' ) + ) . "\n" . + + '' . "\n" . + ''; /* --end browser output-- */ -echo ''; /* --start pf-specific functions-- */ diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php index fb4561ce..37d1b440 100644 --- a/src/printer_friendly_top.php +++ b/src/printer_friendly_top.php @@ -17,6 +17,7 @@ require_once('../functions/strings.php'); require_once('../config/config.php'); require_once('../src/load_prefs.php'); require_once('../functions/page_header.php'); +require_once('../functions/html.php'); displayHtmlHeader( _("Printer Friendly"), "