$server_sort_array;
if (!is_array($server_sort_array)) {
$thread_sort_messages = 0;
- $allow_server_sort = 'false';
+ $allow_server_sort = FALSE;
}
$result = -1;
- if ($thread_sort_messages == 1 || $allow_server_sort == 'true') {
+ if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
reset($server_sort_array);
while(list($key, $value) = each ($server_sort_array)) {
if ($currentArrayIndex == $value) {
}
}
}
- elseif ($sort == 6 && $allow_server_sort != 'true' &&
+ elseif ($sort == 6 && $allow_server_sort != TRUE &&
$thread_sort_messages != 1) {
if ($currentArrayIndex != 1) {
$result = $currentArrayIndex - 1;
}
}
- elseif ($allow_server_sort != 'true' && $thread_sort_messages != 1 ) {
+ elseif ($allow_server_sort != TRUE && $thread_sort_messages != 1 ) {
if (!is_array($msort)) {
return -1;
}
$result = -1;
if (!is_array($server_sort_array)) {
$thread_sort_messages = 0;
- $allow_server_sort = 'false';
+ $allow_server_sort = FALSE;
}
- if ($thread_sort_messages == 1 || $allow_server_sort == 'true') {
+ if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
reset($server_sort_array);
while(list($key, $value) = each ($server_sort_array)) {
if ($currentArrayIndex == $value) {
}
}
}
- elseif ($sort == 6 && $allow_server_sort != 'true' &&
+ elseif ($sort == 6 && $allow_server_sort != TRUE &&
$thread_sort_messages != 1) {
$numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
if ($currentArrayIndex != $numMessages) {
$result = $currentArrayIndex + 1;
}
}
- elseif ($thread_sort_messages != 1 && $allow_server_sort != 'true') {
+ elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) {
if (!is_array($msort)) {
return -1;
}
function ToggleMDNflag ( $set ) {
global $imapConnection, $passed_id, $mailbox;
sqimap_mailbox_select($imapConnection, $mailbox);
-
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
$rem_attachments = array();
foreach ($attachments as $info) {
- if ($info->session == -1) {
+ if ($info['session'] == -1) {
$attached_file = "$hashed_attachment_dir/$info[localfilename]";
if (file_exists($attached_file)) {
unlink($attached_file);
$s .= ' ' . nl2br($second[$j]);
$j++;
}
- parseEmail($s);
+ if(strtolower($f) != 'message-id:') {
+ parseEmail($s); /* Find and linkify emailaddresses except msgid */
+ }
if (isset($f)) {
echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
}
$dateString = getLongDateString($message->header->date);
-/**
- * What do we reply to -- text only, if possible
- */
-$ent_num = findDisplayEntity($message);
-
/** TEXT STRINGS DEFINITIONS **/
$echo_more = _("more");
$echo_less = _("less");
}
do_hook('read_body_top');
+/**
+ * What do we reply to -- text only, if possible
+ */
+
+$body = '';
+
+/* experimental */
+/*
+if ($message->header->type0 == 'multipart' && $message->header->type1 == 'digest') {
+ listEntities($message);
+ for ($i = 0; $i < count($message->entities); $i++) {
+
+ $msg = $message->entities[$i];
+ $body .= $msg->header->type0 .'/'.$msg->header->type1 .'<BR>';
+
+ $msg->header->type0 = 'message';
+ $msg->header->type1 = 'rfc822';
+ $ent_ar = findDisplayEntity($msg, false);
+ for ($i = 0; $i < count($ent_ar); $i++) {
+ $body .= formatBody($imapConnection, $msg, $color, $wrap_at, $ent_ar[$i]);
+ }
+ $i++;
+ }
+} else {
+*/
+ $ent_ar = findDisplayEntity($message, false);
+ $i = 0;
+ for ($i = 0; $i < count($ent_ar); $i++) {
+ $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]);
+ }
+/*
+}
+*/
+
+/* first step in displaying multiple entities */
+$ent_ar = findDisplayEntity($message,true);
+
+$ent_num = $ent_ar[0];
+for ($i = 1 ; $i < count($ent_ar); $i++) {
+ $ent_num .= '_'.$ent_ar[$i];
+}
echo '<BR>' .
'<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' .
'<TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' .
}
echo _("Delete") . '</A> ';
if (($mailbox == $draft_folder) && ($save_as_draft)) {
- echo '| <A HREF="' . $base_uri .
- "src/compose.php?mailbox=$mailbox&identity=$identity&send_to=$url_to_string&send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&subject=$url_subj&mailprio=$priority_level&draft_id=$passed_id&ent_num=$ent_num" . '"';
+ $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&".
+ "identity=$identity&send_to=$url_to_string&".
+ "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&".
+ "subject=$url_subj&mailprio=$priority_level&".
+ "draft_id=$passed_id&ent_num=$ent_num";
+
if ($compose_new_win == '1') {
- echo ' TARGET="compose_window" onClick="comp_in_new()"';
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+ } else {
+ echo '| <A HREF="' . $comp_uri .'"';
}
echo '>'.
_("Resume Draft") . '</a>';
}
if ($mailbox == $sent_folder) {
- echo '| <A HREF="' . $base_uri .
- "src/compose.php?mailbox=$mailbox&identity=$identity&send_to=$url_to_string&send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&subject=$url_subj&mailprio=$priority_level&ent_num=$ent_num" . '"';
+ $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&".
+ "identity=$identity&send_to=$url_to_string&".
+ "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&".
+ "subject=$url_subj&mailprio=$priority_level&".
+ "ent_num=$ent_num&passed_id=$passed_id&edit_as_new=1";
+
if ($compose_new_win == '1') {
- echo ' TARGET="compose_window" onClick="comp_in_new()"';
+ echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+ } else {
+ echo '| <A HREF="' . $comp_uri .'"';
}
echo '>'.
_("Edit Message as New") . '</a>';
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\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '<SMALL>' ;
+
+$comp_uri = $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 "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
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\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '</A> | ';
+
+$comp_uri = $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 "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
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\"";
- if ($compose_new_win == '1') {
- echo 'TARGET="compose_window" onClick="comp_in_new()"';
- }
+ '</A> | ';
+
+$comp_uri = $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 "<a href=\"javascript:void(0)\" onclick=\"comp_in_new(false,'$comp_uri')\"";
+} else {
+ echo '| <A HREF="' . $comp_uri .'"';
+}
+
echo '>'.
_("Reply All") .
'</A> ' .
'<TD BGCOLOR="' . $color[0] . '" ALIGN="RIGHT">' .
_("From:") .
'</TD><TD BGCOLOR="' . $color[0] . '">' .
- "<B>$from_name</B> \n" .
- '</TD>' .
+ "<B>$from_name</B> \n";
+ do_hook("read_body_after_from");
+echo '</TD>' .
'</TR>';
/** date **/
echo '<TR>' . "\n" .
$read = sqimap_run_command ($imapConnection, "FETCH $passed_id FLAGS", true,
$response, $readmessage);
-
$MDN_flag_present = preg_match( '/.*\$MDNSent/i', $read[0]);
if (trim($MDN_to) &&
" 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?") .
"\")) { \n" .
- " window.location=($url); \n" .
- ' window.reload()' . "\n" .
+ ' window.open('.$url.',"right");' . "\n" .
' }' . "\n" .
'// -->' . "\n" .
'</script>' . "\n";
if ( SendMDN( $MDN_to, $final_recipient ) > 0 && $supportMDN ) {
ToggleMDNflag( true);
}
+ ClearAttachments();
}
$sendreceipt = 'removeMDN';
$url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
' </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>'.
- formatBody($imapConnection, $message, $color, $wrap_at).
- '</TD></TR></TABLE>' .
+ '<BR>';
+echo $body;
+
+echo '</TD></TR></TABLE>' .
'<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
" <TR><TD BGCOLOR=\"$color[9]\"> </TD></TR>" .
'</TABLE>' . "\n";