global $msort, $currentArrayIndex, $msgs, $sort,
$thread_sort_messages, $allow_server_sort,
$server_sort_array;
+ if (!is_array($server_sort_array)) {
+ $thread_sort_messages = 0;
+ $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;
}
$mailbox, $data_dir, $username, $thread_sort_messages,
$allow_server_sort, $server_sort_array;
$result = -1;
- if ($thread_sort_messages == 1 || $allow_server_sort == 'true') {
+ if (!is_array($server_sort_array)) {
+ $thread_sort_messages = 0;
+ $allow_server_sort = FALSE;
+ }
+ 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;
}
$rem_attachments[] = $info;
}
}
- $attachments = rem_attachments;
+ $attachments = $rem_attachments;
}
function formatRecipientString($recipients, $item ) {
}
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&passed_id=$passed_id";
+
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> ' .
_("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.location.reload()' . "\n" .
' }' . "\n" .
'// -->' . "\n" .
'</script>' . "\n";