X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=460dbb511ea67aedd4af7330419eeaf610f944bd;hp=5f3721c07b994944a7d2f9e4a5e624ff86b7ce4b;hb=83ae18bcffdbda8eb4b4c5d7d88979df319d2e95;hpb=0462829696c5c74dae890e34d7602d10533fe9f3
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 5f3721c0..460dbb51 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,20 +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);
@@ -39,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])) {
@@ -72,7 +71,7 @@ $body = '';
if ($ent_ar[0] != '') {
for ($i = 0; $i < count($ent_ar); $i++) {
$body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
- $body .= '
';
+ $body .= '
';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@ -82,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
@@ -132,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" .
@@ -151,7 +150,16 @@ echo '
+?>
\ No newline at end of file