$result = $currentArrayIndex - 1;
}
} else {
+ if (!is_array($msort)) {
+ return -1;
+ }
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
if ($currentArrayIndex == $msgs[$key]['ID']) {
next($msort);
$result = $currentArrayIndex + 1;
}
} else {
+ if (!is_array($msort)) {
+ return -1;
+ }
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
if ($currentArrayIndex == $msgs[$key]['ID']) {
prev($msort);
/* Output the link. */
if ($javascript_on) {
- $result .= '<script language="javascript">' . "\n" .
+ $result .= '<script language="javascript" type="text/javascript">' . "\n" .
'<!--' . "\n" .
" function printFormat() {\n" .
' window.open("../src/printer_friendly_main.php' .
$newAttachment = array();
$newAttachment['localfilename'] = $localfilename;
$newAttachment['type'] = "message/disposition-notification";
-
+ $newAttachment['session']=-1;
$attachments[] = $newAttachment;
$MDN_to = trim($recipient);
$reply_id = 0;
- return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3) );
+ return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3, -1) );
}
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $rem_attachments = array();
foreach ($attachments as $info) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- }
-
- $attachments = array();
+ if ($info->session == -1) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+ } else {
+ $rem_attachments[] = $info;
+ }
+ }
+ $attachments = rem_attachments;
+}
+
+function formatRecipientString($recipients, $item ) {
+ global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc, $echo_more, $echo_less, $show_more, $show_more_bcc, $sort;
+
+ $i = 0;
+ $url_string = '';
+
+ if (isset ($recipients[0]) && trim($recipients[0])) {
+ $string = '';
+ $ary = $recipients;
+
+ switch ($item) {
+ case 'to':
+ $show = "&show_more=1&show_more_cc=$show_more_cc&show_more_bcc=$show_more_bcc";
+ $show_n = "&show_more=0&show_more_cc=$show_more_cc&show_more_bcc=$show_more_bcc";
+ break;
+ case 'cc':
+ $show = "&show_more=$show_more&show_more_cc=1&show_more_bcc=$show_more_bcc";
+ $show_n = "&show_more=$show_more&show_more_cc=0&show_more_bcc=$show_more_bcc";
+ $show_more = $show_more_cc;
+ break;
+ case 'bcc':
+ $show = "&show_more=$show_more&show_more_cc=$show_more_cc&show_more_bcc=1";
+ $show_n = "&show_more=$show_more&show_more_cc=$show_more_cc&show_more_bcc=0";
+ $show_more = $show_more_bcc;
+ break;
+ default:
+ $break;
+ }
+
+ while ($i < count($ary)) {
+ $ary[$i] = htmlspecialchars(decodeHeader($ary[$i]));
+ $url_string .= $ary[$i];
+ if ($string) {
+ $string = "$string<BR>$ary[$i]";
+ } else {
+ $string = "$ary[$i]";
+ }
+
+ $i++;
+ if (count($ary) > 1) {
+ if ($show_more == false) {
+ if ($i == 1) {
+ /* From a search... */
+ $string .= ' (<A HREF="' . $base_uri .
+ "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+ if (isset($where) && isset($what)) {
+ $string .= 'what=' . urlencode($what)."&where=".urlencode($where)."$show\">$echo_more</A>)";
+ } else {
+ $string .= "sort=$sort&startMessage=$startMessage"."$show\">$echo_more</A>)";
+ }
+ $i = count($ary);
+ }
+ } else if ($i == 1) {
+ /* From a search... */
+ $string .= ' (<A HREF="' . $base_uri .
+ "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+ if (isset($where) && isset($what)) {
+ $string .= 'what=' . urlencode($what)."&where=".urlencode($where)."$show_n\">$echo_less</A>)";
+ } else {
+ $string .= "sort=$sort&startMessage=$startMessage"."$show_n\">$echo_less</A>)";
+ }
+ }
+ }
+
+ }
+ }
+ else {
+ $string = '';
+ }
+ $url_string = urlencode($url_string);
+ $result = array();
+ $result['str'] = $string;
+ $result['url_str'] = $url_string;
+ return $result;
}
+
/*
* Main of read_boby.php --------------------------------------------------
*/
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> - '.
+ " <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>" . _("Viewing Full Header") . '</B> - '.
'<a href="' . $base_uri . "src/read_body.php?mailbox=".urlencode($mailbox);
if (isset($where) && isset($what)) {
// Got here from a search
- echo "&passed_id=$passed_id&where=".urlencode($where)."&what=".urlencode($what).'">';
+ echo "&passed_id=$passed_id&where=".urlencode($where)."&what=".urlencode($what).'">';
} else {
- echo "&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">";
+ echo "&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">";
}
- echo _("View message") . "</a></b></center></td></tr></table>\n" .
+ echo _("View message") . "</a></b></td></tr></table>\n" .
"<table width=\"99%\" cellpadding=2 cellspacing=0 border=0 align=center>\n" .
'<tr><td>';
$j++;
}
parseEmail($s);
- if (isset($f)) echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
+ if (isset($f)) {
+ echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
+ }
}
echo "</td></tr></table>\n" .
'</body></html>';
$show_more_cc = FALSE;
}
+if (!isset($show_more_bcc)) {
+ $show_more_bcc = FALSE;
+}
+
/** FORMAT THE TO STRING **/
-$i = 0;
-$to_string = '';
-$to_ary = $message->header->to;
-while ($i < count($to_ary)) {
- $to_ary[$i] = htmlspecialchars(decodeHeader($to_ary[$i]));
-
- if ($to_string) {
- $to_string = "$to_string<BR>$to_ary[$i]";
- } else {
- $to_string = "$to_ary[$i]";
- }
+$to = formatRecipientString($message->header->to, "to");
+$to_string = $to['str'];
+$url_to_string = $to['url_str'];
- $i++;
- if (count($to_ary) > 1) {
- if ($show_more == false) {
- if ($i == 1) {
- /* From a search... */
- $to_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
- if (isset($where) && isset($what)) {
- $to_string .= 'where='.urlencode($where)."&what=".urlencode($what)."&show_more=1&show_more_cc=$show_more_cc\">$echo_more</A>)";
- } else {
- $to_string .= "sort=$sort&startMessage=$startMessage&show_more=1&show_more_cc=$show_more_cc\">$echo_more</A>)";
- }
- $i = count($to_ary);
- }
- } else if ($i == 1) {
- /* From a search... */
- $to_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
- if (isset($where) && isset($what)) {
- $to_string .= 'where='.urlencode($where)."&what=".urlencode($what)."&show_more=0&show_more_cc=$show_more_cc\">$echo_less</A>)";
- } else {
- $to_string .= "sort=$sort&startMessage=$startMessage&show_more=0&show_more_cc=$show_more_cc\">$echo_less</A>)";
- }
- }
- }
-}
/** FORMAT THE CC STRING **/
-$i = 0;
-if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) {
- $cc_string = "";
- $cc_ary = $message->header->cc;
- while ($i < count(decodeHeader($cc_ary))) {
- $cc_ary[$i] = htmlspecialchars($cc_ary[$i]);
- if ($cc_string) {
- $cc_string = "$cc_string<BR>$cc_ary[$i]";
- } else {
- $cc_string = "$cc_ary[$i]";
- }
- $i++;
- if (count($cc_ary) > 1) {
- if ($show_more_cc == false) {
- if ($i == 1) {
- /* From a search... */
- $cc_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id";
- if (isset($where) && isset($what)) {
- $cc_string .= '&what='.urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
- } else {
- $cc_string .= "&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
- }
- $i = count($cc_ary);
- }
- } else if ($i == 1) {
- /* From a search... */
- $cc_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
- if (isset($where) && isset($what)) {
- $cc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
- } else {
- $cc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
- }
- }
- }
- }
-}
-else {
- $cc_string = '';
-}
+$cc = formatRecipientString($message->header->cc, "cc");
+$cc_string = $cc['str'];
+$url_cc_string = $cc['url_str'];
/** 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) {
- /* From a search... */
- $bcc_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
- if (isset($where) && isset($what)) {
- $bcc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
- } else {
- $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
- }
- $i = count($bcc_ary);
- }
- } else if ($i == 1) {
- /* From a search... */
- $bcc_string .= ' (<A HREF="' . $base_uri .
- "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
- if (isset($where) && isset($what)) {
- $bcc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
- } else {
- $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
- }
- }
- }
- }
-}
-else {
- $bcc_string = '';
-}
+$bcc = formatRecipientString($message->header->bcc, "bcc");
+$bcc_string = $bcc['str'];
+$url_bcc_string = $bcc['url_str'];
if ($default_use_priority) {
$priority_level = substr($message->header->priority,0,1);
if( $pos == '' ) {
$pos = 0;
}
- echo "search.php?where$pos=".urlencode($where)."&pos=$pos&what$pos=".urlencode($what)."&mailbox=$urlMailbox\">";
+ echo "search.php?where$pos=".urlencode($where)."&pos=$pos&what$pos=".urlencode($what)."&mailbox=$urlMailbox\">";
} else {
- echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
+ echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
}
echo _("Message List") .
'</A> | ' .
- '<A HREF="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&message=$passed_id&";
+ '<A HREF="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&message=$passed_id&";
if ($where && $what) {
- echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">';
+ echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">';
} else {
- echo "sort=$sort&startMessage=$startMessage\">";
+ echo "sort=$sort&startMessage=$startMessage\">";
}
echo _("Delete") . '</A> ';
if (($mailbox == $draft_folder) && ($save_as_draft)) {
echo '| <A HREF="' . $base_uri .
- "src/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\"";
+ "src/compose.php?mailbox=$mailbox&send_to=$url_to_string&send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num" . '"';
if ($compose_new_win == '1') {
echo 'TARGET="compose_window" onClick="comp_in_new()"';
}
$next = findNextMessage();
if ($prev != -1) {
- echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A> | ";
+ echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A> | ";
} else {
echo _("Previous") . ' | ';
}
if ($next != -1) {
- echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>";
+ echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>";
} else {
echo _("Next");
}
echo '</SMALL>' .
'</TD><TD WIDTH="33%" ALIGN="RIGHT">' .
'<SMALL>' .
- '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":"")
- ."mailbox=$urlMailbox&ent_num=$ent_num\"";
+ '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'')
+ ."mailbox=$urlMailbox&ent_num=$ent_num\"";
if ($compose_new_win == '1') {
echo 'TARGET="compose_window" onClick="comp_in_new()"';
}
echo '>'.
_("Forward") .
'</A> | ' .
- '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":"").
- "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
+ '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'').
+ "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
if ($compose_new_win == '1') {
echo 'TARGET="compose_window" onClick="comp_in_new()"';
}
echo '>'.
_("Reply") .
'</A> | ' .
- '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
- ($default_use_priority?"mailprio=$priority_level&":"").
- "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
+ '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
+ ($default_use_priority?"mailprio=$priority_level&":'').
+ "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
if ($compose_new_win == '1') {
echo 'TARGET="compose_window" onClick="comp_in_new()"';
}
'</TR>' .
'</TABLE>' .
'</TD></TR>' .
- '<TR><TD CELLSPACING="0" WIDTH="100%">' .
+ '<TR><TD WIDTH="100%">' .
'<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n" .
'<TR>' . "\n";
"</TD>\n" .
'<TD ROWSPAN="4" width="10%" BGCOLOR="' . $color[0] .
'" ALIGN=right VALIGN=top NOWRAP><small>'.
- '<A HREF="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+ '<A HREF="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
/* From a search... */
if ($where && $what) {
- echo 'where=' . urlencode($where) . '&what=' . urlencode($what) .
- "&view_hdr=1\">" . _("View Full Header") . "</A>\n";
+ echo 'where=' . urlencode($where) . '&what=' . urlencode($what) .
+ "&view_hdr=1\">" . _("View Full Header") . "</A>\n";
} else {
- echo "startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" .
+ echo "startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" .
_("View Full Header") . "</A>\n";
}
if ($mdn_user_support) {
// debug gives you the capability to remove mdn-flags
- $MDNDebug = false;
+ // $MDNDebug = false;
$read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (Disposition-Notification-To)]", true,
$response, $readmessage);
$MDN_to = substr($read[1], strpos($read[1], ' '));
if ( $MDN_flag_present && $supportMDN) {
$sendreceipt = 'removeMDN';
- $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
- $sendreceipt="";
+ $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+ $sendreceipt='';
+ /*
if ($MDNDebug ) {
echo '<TR>' .
"<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
'</TD>' .
'</TR>' . "\n";
} else {
- echo '<TR>' .
- "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
- _("Read receipt") . ': ' .
- "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
- '<B>'._("send").'</B>'.
- '</TD>' .
- '</TR>' . "\n";
+ */
+ echo '<TR>' .
+ "<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
+ _("Read receipt") . ': ' .
+ "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
+ '<B>'._("send").'</B>'.
+ '</TD>' .
+ '</TR>' . "\n";
+ /*
}
+ */
} // when deleted or draft flag is set don't offer to send a MDN response
else if ( ereg('\\Draft',$read[0] || ereg('\\Deleted',$read[0])) ) {
$sendreceipt = 'send';
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
if ($javascript_on) {
- echo "<script language=\"javascript\"> \n" .
+ echo "<script language=\"javascript\" type=\"text/javascript\"> \n" .
'<!-- ' . "\n" .
" if (window.confirm(\"" .
_("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") .
}
}
$sendreceipt = 'removeMDN';
- $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
- $sendreceipt="";
-
+ $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+ $sendreceipt='';
+ /*
if ($MDNDebug && $supportMDN) {
echo " <TR>\n" .
" <TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>\n" .
' </TD>' . "\n" .
' </TR>' . "\n";
} else {
+ */
echo " <TR>\n" .
" <TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>\n" .
" "._("Read receipt").": \n".
' <B>'._("send").'</B>'. "\n" .
' </TD>' . "\n" .
' </TR>' . "\n";
+ /*
}
+ */
}
elseif ($sendreceipt == 'removeMDN' ) {
ToggleMDNflag ( false );
$sendreceipt = 'send';
- $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+ $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
echo '<TR>'.
"<TD BGCOLOR=\"$color[9]\" ALIGN=RIGHT VALIGN=TOP>" .
_("Read receipt") . ': ' .
" <TR><TD BGCOLOR=\"$color[4]\" WIDTH=\"100%\">\n" .
'<BR>'.
formatBody($imapConnection, $message, $color, $wrap_at).
- '</TABLE>' .
+ '</TD></TR></TABLE>' .
'<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
" <TR><TD BGCOLOR=\"$color[9]\"> </TD></TR>" .
'</TABLE>' . "\n";
$imgurl = '../src/download.php' .
'?' .
'passed_id=' . urlencode($img['passed_id']) .
- '&mailbox=' . urlencode($mailbox) .
- '&passed_ent_id=' . urlencode($img['ent_id']) .
- '&absolute_dl=true';
+ '&mailbox=' . urlencode($mailbox) .
+ '&passed_ent_id=' . urlencode($img['ent_id']) .
+ '&absolute_dl=true';
echo "<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>\n" .
'<TR>' .
projects / squirrelmail.git / blobdiff