** $Id$
**/
- include("../src/validate.php");
- include('../functions/imap.php');
- include('../functions/mime.php');
- include('../functions/date.php');
- include('../functions/url_parser.php');
+ require_once('../src/validate.php');
+ require_once('../functions/imap.php');
+ require_once('../functions/mime.php');
+ require_once('../functions/date.php');
+ require_once('../functions/url_parser.php');
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
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 '<br>';
- echo '<table width="100%" cellpadding="2" cellspacing="0" border="0" align="center">' . "\n";
- echo " <TR><TD BGCOLOR=\"$color[9]\" WIDTH=100%><center><b>" . _("Viewing full header") . '</b> - ';
+ echo '<br>' .
+ '<table width="100%" cellpadding="2" cellspacing="0" border="0" align="center">' . "\n" .
+ " <TR><TD BGCOLOR=\"$color[9]\" WIDTH=100%><center><b>" . _("Viewing full header") . '</b> - ';
if (isset($where) && isset($what)) {
// Got here from a search
echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$passed_id&where=".urlencode($where)."&what=".urlencode($what).'">';
} else {
echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">";
}
- echo ''._("View message") . "</a></b></center></td></tr></table>\n";
- echo "<table width=99% cellpadding=2 cellspacing=0 border=0 align=center>\n";
- echo '<tr><td>';
+ echo ''._("View message") . "</a></b></center></td></tr></table>\n" .
+ "<table width=99% cellpadding=2 cellspacing=0 border=0 align=center>\n" .
+ '<tr><td>';
$cnum = 0;
for ($i=1; $i < count($read); $i++) {
/** translate the subject and mailbox into url-able text **/
$url_subj = urlencode(trim($message->header->subject));
$urlMailbox = urlencode($mailbox);
- $url_replyto = urlencode($message->header->replyto);
+ $url_replyto = '';
+ if (isset($message->header->replyto))
+ $url_replyto = urlencode($message->header->replyto);
- $url_replytoall = urlencode($message->header->replyto);
+ $url_replytoall = $url_replyto;
// If we are replying to all, then find all other addresses and
// add them to the list. Remove duplicates.
array_keys(array_flip($url_replytoall_extra_addrs));
// 5) Remove the addresses we'll be sending the message 'to'
- $url_replytoall_avoid_addrs = parseAddrs($message->header->replyto);
+ $url_replytoall_avoid_addrs = '';
+ 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)
{
RemoveAddress($url_replytoall_extra_addrs, $addr);
}
// 6) Remove our identities from the CC list (they still can be in the
- // TO list)
- RemoveAddress($url_replytoall_extra_addrs, getPref($data_dir, $username,
- 'email_address'));
- $idents = getPref($data_dir, $username, 'identities');
- if ($idents != '' && $idents > 1)
+ // TO list) only if $include_self_reply_all isn't set or it is ''.
+ if (getPref($data_dir, $username, 'include_self_reply_all') == '')
{
- for ($i = 1; $i < $idents; $i ++)
+ RemoveAddress($url_replytoall_extra_addrs,
+ getPref($data_dir, $username, 'email_address'));
+ $idents = getPref($data_dir, $username, 'identities');
+ if ($idents != '' && $idents > 1)
{
- RemoveAddress($url_replytoall_extra_addrs,
- getPref($data_dir, $username, 'email_address' . $i));
+ for ($i = 1; $i < $idents; $i ++)
+ {
+ RemoveAddress($url_replytoall_extra_addrs,
+ getPref($data_dir, $username, 'email_address' .
+ $i));
+ }
}
- }
+ }
// 7) Smoosh back into one nice line
$url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs);
$subject = decodeHeader(htmlspecialchars($message->header->subject));
do_hook('read_body_top');
- echo '<BR>';
-
- echo '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n";
- echo ' <TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">';
- echo ' <TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">';
- echo ' <TR>';
- echo ' <TD ALIGN="LEFT" WIDTH="33%">';
- echo ' <SMALL>';
+ 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>';
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");
- echo '</A> ';
- echo ' </SMALL>';
- echo ' </TD><TD WIDTH="33%" ALIGN="CENTER">';
- echo ' <SMALL>' . "\n";
+ echo _("Delete") .
+ '</A> ' .
+ ' </SMALL>' .
+ ' </TD><TD WIDTH="33%" ALIGN="CENTER">' .
+ ' <SMALL>' . "\n";
if ($where && $what) {
} else {
if ($currentArrayIndex == -1) {
echo _("Next");
}
}
- echo ' </SMALL>' . "\n";
- echo ' </TD><TD WIDTH="33%" ALIGN="RIGHT">';
- echo ' <SMALL>';
- echo " <A HREF=\"compose.php?forward_id=$passed_id&forward_subj=$url_subj&mailbox=$urlMailbox&ent_num=$ent_num\">";
- echo _("Forward");
- echo '</A> | ';
- echo " <A HREF=\"compose.php?send_to=$url_replyto&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">";
- echo _("Reply");
- echo '</A> | ';
- echo " <A HREF=\"compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">";
- echo _("Reply All");
- echo '</A> ';
- echo ' </SMALL>';
- echo ' </TD>';
- echo ' </TR>';
- echo ' </TABLE>';
- echo ' </TD></TR>';
- echo ' <TR><TD CELLSPACING="0" WIDTH="100%">';
- echo ' <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n";
- echo ' <TR>' . "\n";
+ echo ' </SMALL>' . "\n" .
+ ' </TD><TD WIDTH="33%" ALIGN="RIGHT">' .
+ ' <SMALL>' .
+ " <A HREF=\"compose.php?forward_id=$passed_id&forward_subj=$url_subj&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+ _("Forward") .
+ '</A> | ' .
+ " <A HREF=\"compose.php?send_to=$url_replyto&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+ _("Reply") .
+ '</A> | ' .
+ " <A HREF=\"compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+ _("Reply All") .
+ '</A> ' .
+ ' </SMALL>' .
+ ' </TD>' .
+ ' </TR>' .
+ ' </TABLE>' .
+ ' </TD></TR>' .
+ ' <TR><TD CELLSPACING="0" WIDTH="100%">' .
+ ' <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n" .
+ ' <TR>' . "\n" .
/** subject **/
- echo " <TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\" VALIGN=\"top\">\n";
- echo _("Subject:");
- echo " </TD><TD BGCOLOR=\"$color[0]\" WIDTH=\"80%\" VALIGN=\"top\">\n";
- echo " <B>$subject</B> \n";
- echo " </TD>\n";
- echo ' <TD ROWSPAN="4" width=10% BGCOLOR="'.$color[0].'" ALIGN=right VALIGN=top NOWRAP><small>' . "\n";
+ " <TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\" VALIGN=\"top\">\n" .
+ _("Subject:") .
+ " </TD><TD BGCOLOR=\"$color[0]\" WIDTH=\"80%\" VALIGN=\"top\">\n" .
+ " <B>$subject</B> \n" .
+ " </TD>\n" .
+ ' <TD ROWSPAN="4" width=10% BGCOLOR="'.$color[0].'" ALIGN=right VALIGN=top NOWRAP><small>' . "\n";
if ($where && $what) {
// Got here from a search
echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&where=".urlencode($where)."&what=".urlencode($what)."&view_hdr=1\">" . _("View full header") . "</a>\n";
echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" . _("View full header") . "</a>\n";
}
do_hook("read_body_header_right");
- echo '</small></TD>' . "\n";
- echo ' </TR>' ."\n";
+ echo '</small></TD>' . "\n" .
+ ' </TR>' ."\n" .
/** from **/
- echo ' <TR>' . "\n";
- echo ' <TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' . "\n";
- echo _("From:");
- echo ' </TD><TD BGCOLOR="' . $color[0] . '">' . "\n";
- echo " <B>$from_name</B> \n";
- echo ' </TD>' . "\n";
- echo ' </TR>' . "\n";
+ ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' . "\n" .
+ _("From:") .
+ ' </TD><TD BGCOLOR="' . $color[0] . '">' . "\n" .
+ " <B>$from_name</B> \n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n" .
/** date **/
- echo ' <TR>' . "\n";
- echo ' <TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' . "\n";
- echo _("Date:");
- echo " </TD><TD BGCOLOR=\"$color[0]\">\n";
- echo " <B>$dateString</B> \n";
- echo ' </TD>' . "\n";
- echo ' </TR>' . "\n";
+ ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' . "\n" .
+ _("Date:") .
+ " </TD><TD BGCOLOR=\"$color[0]\">\n" .
+ " <B>$dateString</B> \n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n" .
/** to **/
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n";
- echo _("To:");
- echo ' </TD><TD BGCOLOR="' . $color[0] . '" VALIGN="TOP">' . "\n";
- echo " <B>$to_string</B> \n";
- echo ' </TD>' . "\n";
- echo ' </TR>' . "\n";
+ " <TR>\n" .
+ " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+ _("To:") .
+ ' </TD><TD BGCOLOR="' . $color[0] . '" VALIGN="TOP">' . "\n" .
+ " <B>$to_string</B> \n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
/** cc **/
if (isset($cc_string)) {
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n";
- echo ' Cc:' . "\n";
- echo " </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n";
- echo " <B>$cc_string</B> \n";
- echo ' </TD>' . "\n";
- echo ' </TR>' . "\n";
+ echo " <TR>\n" .
+ " <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+ ' Cc:' . "\n" .
+ " </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+ " <B>$cc_string</B> \n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
}
do_hook("read_body_header");
- echo '</TABLE>';
- echo ' </TD></TR>';
- echo '</table>';
- echo "<TABLE CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
-
- echo " <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n";
- echo '<BR>';
+ echo '</TABLE>' .
+ ' </TD></TR>' .
+ '</table>';
+ flush();
+ echo "<TABLE CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
+ " <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n" .
+ '<BR>';
$body = formatBody($imapConnection, $message, $color, $wrap_at);
- echo $body;
-
- echo '</TABLE>';
- echo '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n";
- echo " <TR><TD BGCOLOR=\"$color[9]\"> </TD></TR>";
- echo '</TABLE>' . "\n";
+ echo $body .
+ '</TABLE>' .
+ '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
+ " <TR><TD BGCOLOR=\"$color[9]\"> </TD></TR>" .
+ '</TABLE>' . "\n";
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
-?>
+?>
\ No newline at end of file
projects / squirrelmail.git / blobdiff