X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=b5b193107073d2020f3cd761c55df9802d71a34d;hb=d7a4ccb4c5ae4fcd4d45ff84b5d0286982422357;hp=abc0cc52546c3552b1ca3b8a6292a70164bcf6af;hpb=3bbf5974b641c19d1450a1a8063a4c7c07fb9222;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index abc0cc52..b5b19310 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -14,22 +14,6 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - require_once('../src/validate.php'); require_once('../functions/strings.php'); require_once('../config/config.php'); @@ -37,109 +21,102 @@ require_once('../src/load_prefs.php'); require_once('../functions/imap.php'); require_once('../functions/page_header.php'); - $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); - - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - sqimap_mailbox_select($imap_stream, $mailbox); - $message = sqimap_get_message($imap_stream, $passed_id, $mailbox); - - -// --start display setup-- - - // From and Date are usually fine as they are... - $from = decodeHeader($message->header->from); - $date = getLongDateString($message->header->date); - - // we can clean these up if the list is too long... - $cc = decodeHeader(getLineOfAddrs($message->header->cc)); - $to = decodeHeader(getLineOfAddrs($message->header->to)); - - // and Body and Subject could easily stream off the page... - $id = $message->header->id; - $ent_num = findDisplayEntity ($message, 0); - $body_message = getEntity($message, $ent_num); - if (($body_message->header->type0 == 'text') || - ($body_message->header->type0 == 'rfc822')) { - $body = mime_fetch_body ($imap_stream, $id, $ent_num); - $body = decodeBody($body, $body_message->header->encoding); - $hookResults = do_hook("message_body", $body); - $body = $hookResults[1]; - if ($body_message->header->type1 == 'html') { - if( $show_html_default <> 1 ) { - $body = strip_tags( $body ); - translateText($body, $wrap_at, $body_message->header->charset); - } else { - $body = MagicHTML( $body, $id ); - } - } else { +$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); + +$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +sqimap_mailbox_select($imap_stream, $mailbox); +$message = sqimap_get_message($imap_stream, $passed_id, $mailbox); + +/* --start display setup-- */ + +/* From and Date are usually fine as they are... */ +$from = decodeHeader($message->header->from); +$date = getLongDateString($message->header->date); + +/* we can clean these up if the list is too long... */ +$cc = decodeHeader(getLineOfAddrs($message->header->cc)); +$to = decodeHeader(getLineOfAddrs($message->header->to)); + +/* and Body and Subject could easily stream off the page... */ +$id = $message->header->id; +$ent_num = findDisplayEntity ($message, 0); +$body_message = getEntity($message, $ent_num); +if (($body_message->header->type0 == 'text') || + ($body_message->header->type0 == 'rfc822')) { + $body = mime_fetch_body ($imap_stream, $id, $ent_num); + $body = decodeBody($body, $body_message->header->encoding); + $hookResults = do_hook('message_body', $body); + $body = $hookResults[1]; + if ($body_message->header->type1 == 'html') { + if( $show_html_default <> 1 ) { + $body = strip_tags( $body ); translateText($body, $wrap_at, $body_message->header->charset); - } } else { - $body = _("Message not printable"); + $body = MagicHTML( $body, $id ); } + } else { + translateText($body, $wrap_at, $body_message->header->charset); + } +} else { + $body = _("Message not printable"); +} - $subject = trim(decodeHeader($message->header->subject)); - - // now, if they choose to, we clean up the display a bit... - /* - if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { - - $num_leading_spaces = 9; // nine leading spaces for indentation - - // sometimes I see ',,' instead of ',' seperating addresses *shrug* - $cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces); - $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces); +$subject = trim(decodeHeader($message->header->subject)); - // the body should have no leading zeros - $body = pf_clean_string($body, 0); + /* now, if they choose to, we clean up the display a bit... */ + /* +if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { - // clean up everything else... - $subject = pf_clean_string($subject, $num_leading_spaces); - $from = pf_clean_string($from, $num_leading_spaces); - $date = pf_clean_string($date, $num_leading_spaces); + $num_leading_spaces = 9; // nine leading spaces for indentation - } // end cleanup - */ - // --end display setup-- + // sometimes I see ',,' instead of ',' seperating addresses *shrug* + $cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces); + $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces); + // the body should have no leading zeros + $body = pf_clean_string($body, 0); - // --start browser output-- - displayHtmlHeader( _("Printer Friendly"), '', FALSE ); + // clean up everything else... + $subject = pf_clean_string($subject, $num_leading_spaces); + $from = pf_clean_string($from, $num_leading_spaces); + $date = pf_clean_string($date, $num_leading_spaces); - echo "\n" . - // headers (we use table becasue 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; +} // end cleanup +*/ +// --end display setup-- -// --end browser output-- +/* --start browser output-- */ +displayHtmlHeader( _("Printer Friendly"), '', FALSE ); -?> - - +echo "\n" . + /* headers (we use table becasue 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; -'; +/* --start pf-specific functions-- */ - // $string = pf_clean_string($string, 9); +/* $string = pf_clean_string($string, 9); */ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { global $data_dir, $username; $wrap_at = getPref($data_dir, $username, 'wrap_at', 86); - $wrap_at = $wrap_at - $num_leading_spaces; // header stuff + $wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */ $leading_spaces = ''; while ( strlen($leading_spaces) < $num_leading_spaces ) @@ -149,7 +126,7 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { while ( strlen($unclean_string) > $wrap_at ) { $this_line = substr($unclean_string, 0, $wrap_at); - if ( strrpos( $this_line, "\n" ) ) // this should NEVER happen with anything but the $body + if ( strrpos( $this_line, "\n" ) ) /* this should NEVER happen with anything but the $body */ { $clean_string .= substr( $this_line, 0, strrpos( $this_line, "\n" )); $clean_string .= $leading_spaces; @@ -162,11 +139,12 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { $unclean_string = substr($unclean_string, (1+strrpos( $this_line, ' ' ))); } } + $clean_string .= $unclean_string; return $clean_string; -} // end pf_clean_string() function +} /* end pf_clean_string() function */ -// --end pf-specific functions +/* --end pf-specific functions */ ?> \ No newline at end of file