// 5) Remove the addresses we'll be sending the message 'to'
$url_replytoall_avoid_addrs = '';
- if (isset($message->header->replyto))
+ if (isset($message->header->replyto)) {
$url_replytoall_avoid_addrs = $message->header->replyto;
+ }
+
$url_replytoall_avoid_addrs = parseAddrs($url_replytoall_avoid_addrs);
- foreach ($url_replytoall_avoid_addrs as $addr)
- {
+ foreach ($url_replytoall_avoid_addrs as $addr) {
RemoveAddress($url_replytoall_extra_addrs, $addr);
}
// 6) Remove our identities from the CC list (they still can be in the
- // TO list) only if $include_self_reply_all isn't set or it is ''.
- if (getPref($data_dir, $username, 'include_self_reply_all') == '')
- {
+ // TO list) only if $include_self_reply_all is turned off
+ if (!$include_self_reply_all) {
RemoveAddress($url_replytoall_extra_addrs,
getPref($data_dir, $username, 'email_address'));
$idents = getPref($data_dir, $username, 'identities');
- if ($idents != '' && $idents > 1)
- {
- for ($i = 1; $i < $idents; $i ++)
- {
+ if ($idents != '' && $idents > 1) {
+ for ($i = 1; $i < $idents; $i ++) {
RemoveAddress($url_replytoall_extra_addrs,
getPref($data_dir, $username, 'email_address' .
$i));
}
}
}
+ /** 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<BR>$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 (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+ } else {
+ $bcc_string = "$bcc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+ }
+ $i = count($bcc_ary);
+ }
+ } else if ($i == 1) {
+ if (isset($where) && isset($what)) {
+ // from a search
+ $bcc_string = "$bcc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+ } else {
+ $bcc_string = "$bcc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+ }
+ }
+ }
+ }
+ }
+
+ if($default_use_priority) {
+ switch(substr($message->header->priority,0,1)) {
+ case "1" : $priority_string = _("High");
+ break;
+ case "3" : $priority_string = _("Normal");
+ break;
+ case "5" : $priority_string = _("Low");
+ break;
+ }
+ }
/** 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 '<BR>' .
'<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
- ' <TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' .
- ' <TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">' .
- ' <TR>' .
- ' <TD ALIGN="LEFT" WIDTH="33%">' .
- ' <SMALL>';
+ ' <TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' . "\n" .
+ ' <TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">' . "\n" .
+ ' <TR>' . "\n" .
+ ' <TD ALIGN="LEFT" WIDTH="33%">' . "\n" .
+ ' <SMALL>' . "\n";
if ($where && $what) {
echo " <A HREF=\"search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=$urlMailbox\">";
} else {
} else {
echo " <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=$startMessage\">";
}
- echo _("Delete") .
- '</A> ' .
+ echo _("Delete") . '</A> ';
+ if (($mailbox == $draft_folder) && ($save_as_draft)) {
+ echo '| ';
+ echo " <A HREF=\"compose.php?mailbox=$mailbox&send_to=$to_string&send_to_cc=$cc_string&send_to_bcc=$bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num\">";
+ echo _("Resume Draft") . '</a>';
+ }
+ echo ' ' .
' </SMALL>' .
' </TD><TD WIDTH="33%" ALIGN="CENTER">' .
' <SMALL>' . "\n";
+
if ($where && $what) {
} else {
if ($currentArrayIndex == -1) {
' </TD>' . "\n" .
' </TR>' . "\n";
}
+ /** bcc **/
+ if (isset($bcc_string)) {
+ echo " <TR>\n" .
+ " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+ ' Bcc:' . "\n" .
+ " </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+ " <B>$bcc_string</B> \n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
+ }
+ if ($default_use_priority) {
+ if (isset($priority_string)) {
+ echo " <TR>\n" .
+ " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+ " "._("Priority").": \n".
+ " </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+ " <B>$priority_string</B> \n" .
+ " </TD>" . "\n" .
+ " </TR>" . "\n";
+ }
+ }
+ if ($show_xmailer_default) {
+ fputs ($imapConnection, sqimap_session_id() .
+ " FETCH $passed_id BODY.PEEK[HEADER.FIELDS (X-Mailer)]\r\n");
+ $read = sqimap_read_data ($imapConnection, sqimap_session_id(), true,
+ $response, $readmessage);
+ $mailer = substr($read[1], strpos($read[1], " "));
+ if (trim($mailer)) {
+ echo " <TR>\n" .
+ " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+ " "._("Mailer").": \n".
+ " </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+ " <B>$mailer</B> \n" .
+ " </TD>" . "\n" .
+ " </TR>" . "\n";
+ }
+ }
+
do_hook("read_body_header");
echo '</TABLE>' .
' </TD></TR>' .
- '</table>' .
- "<TABLE CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
+ '</table>';
+ flush();
+ echo "<TABLE CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
" <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n" .
'<BR>';
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
-?>
\ No newline at end of file
+?>
projects / squirrelmail.git / blobdiff