X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=c987954b7c397e56d4d5ae6294b4991268ac86ea;hb=f1177e370685e47d9e3fcff3b03a84d03ab66bdd;hp=50c18b1a72efafb41cf910c08b9f4fa4b3d62ec1;hpb=ff8a98e7e1d368c57b088522586bddcf68d443a5;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 50c18b1a..c987954b 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -23,21 +23,21 @@ displayPageHeader($color, $mailbox); if (isset($view_hdr)) { - fputs ($imapConnection, "a003 FETCH $passed_id BODY[HEADER]\r\n"); - $read = sqimap_read_data ($imapConnection, "a003", true, $a, $b); + fputs ($imapConnection, sqimap_session_id() . " FETCH $passed_id BODY[HEADER]\r\n"); + $read = sqimap_read_data ($imapConnection, sqimap_session_id(), true, $a, $b); - echo '
'; - echo '' . "\n"; - echo "
" . _("Viewing full header") . ' - '; + echo '
' . + '' . "\n" . + "
" . _("Viewing full header") . ' - '; if (isset($where) && isset($what)) { // Got here from a search echo "'; } else { echo ""; } - echo ''._("View message") . "
\n"; - echo "\n"; - echo '
'; + echo ''._("View message") . "
\n" . + "\n" . + '
'; $cnum = 0; for ($i=1; $i < count($read); $i++) { @@ -299,19 +299,53 @@ } } } + /** FORMAT THE BCC STRING **/ + $i = 0; + if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){ + $bcc_string = ""; + $bcc_ary = $message->header->bcc; + while ($i < count(decodeHeader($bcc_ary))) { + $bcc_ary[$i] = htmlspecialchars($bcc_ary[$i]); + if ($bcc_string) + $bcc_string = "$bcc_string
$bcc_ary[$i]"; + else + $bcc_string = "$bcc_ary[$i]"; + + $i++; + if (count($bcc_ary) > 1) { + if ($show_more_cc == false) { + if ($i == 1) { + if (isset($where) && isset($what)) { + // from a search + $bcc_string = "$bcc_string ($echo_more)"; + } else { + $bcc_string = "$bcc_string ($echo_more)"; + } + $i = count($bcc_ary); + } + } else if ($i == 1) { + if (isset($where) && isset($what)) { + // from a search + $bcc_string = "$bcc_string ($echo_less)"; + } else { + $bcc_string = "$bcc_string ($echo_less)"; + } + } + } + } + } /** make sure everything will display in HTML format **/ $from_name = decodeHeader(htmlspecialchars($message->header->from)); $subject = decodeHeader(htmlspecialchars($message->header->subject)); do_hook('read_body_top'); - echo '
'; - - echo '' . "\n"; - echo '
'; - echo ' '; - echo ' '; - echo ' ' . + '
'; - echo ' '; + echo '
' . + '' . "\n" . + ' '; - echo ' ' . + ' '; - echo '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' '; - echo ' '; - echo '
' . "\n" . + ' ' . "\n"; if ($where && $what) { echo " "; } else { @@ -324,11 +358,17 @@ } else { echo " "; } - echo _("Delete"); - echo '  '; - echo ' '; - echo ' '; - echo ' ' . "\n"; + echo _("Delete") . ' '; + if (($mailbox == $draft_folder) && ($save_as_draft)) { + echo '| '; + echo " "; + echo _("Resume Draft") . ''; + } + echo '  ' . + ' ' . + ' ' . + ' ' . "\n"; + if ($where && $what) { } else { if ($currentArrayIndex == -1) { @@ -346,33 +386,33 @@ echo _("Next"); } } - echo ' ' . "\n"; - echo ' '; - echo ' '; - echo " "; - echo _("Forward"); - echo ' | '; - echo " "; - echo _("Reply"); - echo ' | '; - echo " "; - echo _("Reply All"); - echo '  '; - echo ' '; - echo '
'; - echo '
'; - echo ' ' . "\n"; - echo ' ' . "\n"; + echo ' ' . "\n" . + ' ' . + ' ' . + '
' . + ' ' . + " " . + _("Forward") . + ' | ' . + " " . + _("Reply") . + ' | ' . + " " . + _("Reply All") . + '  ' . + ' ' . + '
' . + '
' . + ' ' . "\n" . + ' ' . "\n" . /** subject **/ - echo " \n"; - echo ' \n" . + ' ' . "\n"; - echo ' ' ."\n"; + echo '' . "\n" . + ' ' ."\n" . /** from **/ - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . /** date **/ - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . /** to **/ - echo " \n"; - echo " ' . "\n"; - echo ' ' . "\n"; + " \n" . + " ' . "\n" . + ' ' . "\n"; /** cc **/ if (isset($cc_string)) { - echo " \n"; - echo " ' . "\n"; - echo ' ' . "\n"; + echo " \n" . + " ' . "\n" . + ' ' . "\n"; + } + /** bcc **/ + if (isset($bcc_string)) { + echo " \n" . + " ' . "\n" . + ' ' . "\n"; } do_hook("read_body_header"); - echo '
\n"; - echo _("Subject:"); - echo " \n"; - echo " $subject \n"; - echo " ' . "\n"; + " \n" . + _("Subject:") . + " \n" . + " $subject \n" . + " ' . "\n"; if ($where && $what) { // Got here from a search echo "" . _("View full header") . "\n"; @@ -380,59 +420,68 @@ echo "" . _("View full header") . "\n"; } do_hook("read_body_header_right"); - echo '
' . "\n"; - echo _("From:"); - echo ' ' . "\n"; - echo " $from_name \n"; - echo '
' . "\n" . + _("From:") . + ' ' . "\n" . + " $from_name \n" . + '
' . "\n"; - echo _("Date:"); - echo " \n"; - echo " $dateString \n"; - echo '
' . "\n" . + _("Date:") . + " \n" . + " $dateString \n" . + '
\n"; - echo _("To:"); - echo ' ' . "\n"; - echo " $to_string \n"; - echo '
\n" . + _("To:") . + ' ' . "\n" . + " $to_string \n" . + '
\n"; - echo ' Cc:' . "\n"; - echo " \n"; - echo " $cc_string \n"; - echo '
\n" . + ' Cc:' . "\n" . + " \n" . + " $cc_string \n" . + '
\n" . + ' Bcc:' . "\n" . + " \n" . + " $bcc_string \n" . + '
'; - echo '
'; - echo "\n"; - - echo "
\n"; - echo '
'; + echo '
' . + '
'; + flush(); + echo "\n" . + "
\n" . + '
'; $body = formatBody($imapConnection, $message, $color, $wrap_at); - echo $body; - - echo '
'; - echo '' . "\n"; - echo " "; - echo '
 
' . "\n"; + echo $body . + '
' . + '' . "\n" . + " " . + '
 
' . "\n"; do_hook('read_body_bottom'); do_hook('html_bottom');