X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=a4888333626b0e051545addf1eb0bd80fce71480;hp=a9a76830a64fd1e44a793a2d739d154a12486e86;hb=28e62e6d76cf414fbdaa1dd02eae4344d11ab2d6;hpb=8f6f9ba5df6491d396aa690dcf3e5b9070a565ca
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index a9a76830..a4888333 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,7 +3,7 @@
/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* with javascript on, it is the bottom frame of printer_friendly_main.php
@@ -11,21 +11,19 @@
*
* - this is the page that does all the work, really.
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
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 */
sqgetGlobalVar('username', $username, SQ_SESSION);
@@ -40,7 +38,7 @@ if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
}
/* end globals */
-$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
+$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', false);
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) {
@@ -83,7 +81,7 @@ if ($ent_ar[0] != '') {
/* now, if they choose to, we clean up the display a bit... */
-if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
+if ($pf_cleandisplay) {
$num_leading_spaces = 9; // nine leading spaces for indentation
@@ -133,15 +131,15 @@ echo ' 0 ) { /* only show CC: if it's there... */
+ 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', _("Cc").' ', 'left','','valign="top"' ) .
html_tag( 'td', $cc, 'left' )
);
}
/* body */
echo html_tag( 'tr',
- html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
+ html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
) . "\n" .
'' . "\n" .
@@ -152,7 +150,16 @@ echo '
+?>
\ No newline at end of file