X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=90a644bcc0c54baef9ac97aaec1cad7f99e05e33;hb=b135de9c8c0238f850abca25b972b0969bc5d205;hp=6e6692f993c0208d78d2bcb66dc4d1db5a5c8146;hpb=4e9f35e4c75579430c17919e2887640842f2daa3;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 6e6692f9..90a644bc 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -13,358 +13,514 @@
*/
require_once('../functions/strings.php');
+require_once('../functions/html.php');
+require_once('../class/html.class.php');
+require_once('../functions/imap_mailbox.php');
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
-function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort,
- $start_msg, $where, $what){
- global $checkall,
- $color, $msgs, $msort,
- $sent_folder, $draft_folder,
- $default_use_priority,
- $message_highlight_list,
- $index_order,
- $indent_array, /* indent subject by */
- $pos, /* Search postion (if any) */
- $thread_sort_messages, /* thread sorting on/off */
- $server_sort_order, /* sort value when using server-sorting */
- $row_count,
- $allow_server_sort; /* enable/disable server-side sorting */
- $color_string = $color[4];
-
- if ($GLOBALS['alt_index_colors']) {
- if (!isset($row_count)) {
- $row_count = 0;
+function printMessageInfo($imapConnection, $t, $i, $key, $mailbox,
+ $start_msg, $where, $what) {
+ global $checkall,
+ $color, $msgs, $msort,
+ $default_use_priority,
+ $message_highlight_list,
+ $index_order,
+ $indent_array, /* indent subject by */
+ $pos, /* Search postion (if any) */
+ $thread_sort_messages, /* thread sorting on/off */
+ $server_sort_order, /* sort value when using server-sorting */
+ $row_count,
+ $allow_server_sort; /* enable/disable server-side sorting */
+ $color_string = $color[4];
+
+ if ($GLOBALS['alt_index_colors']) {
+ if (!isset($row_count)) {
+ $row_count = 0;
+ }
+ $row_count++;
+ if ($row_count % 2) {
+ if (!isset($color[12])) {
+ $color[12] = '#EAEAEA';
+ }
+ $color_string = $color[12];
+ }
}
- $row_count++;
- if ($row_count % 2) {
- if (!isset($color[12])) {
- $color[12] = '#EAEAEA';
- }
- $color_string = $color[12];
+ $msg = $msgs[$key];
+
+ if( $mailbox == 'None' ) {
+ $boxes = sqimap_mailbox_list($imapConnection);
+ $mailbox = $boxes[0]['unformatted'];
+ unset( $boxes );
}
- }
- $msg = $msgs[$key];
-
- /*
- * This is done in case you're looking into Sent folders,
- * because you can have multiple receivers.
- */
- $senderNames = explode(',', $msg['FROM']);
- $senderName = '';
- if (sizeof($senderNames)){
- foreach ($senderNames as $senderNames_part) {
- if ($senderName != '') {
- $senderName .= ', ';
- }
- $senderName .= sqimap_find_displayable_name($senderNames_part);
+ $urlMailbox = urlencode($mailbox);
+
+ if (handleAsSent($mailbox)) {
+ $msg['FROM'] = $msg['TO'];
+ /*
+ * This is done in case you're looking into Sent folders,
+ * because you can have multiple receivers.
+ */
+ $senderNames = explode(',', $msg['FROM']);
+ $senderName = '';
+ if (sizeof($senderNames)){
+ foreach ($senderNames as $senderNames_part) {
+ if ($senderName != '') {
+ $senderName .= ', ';
+ }
+ $senderName .= sqimap_find_displayable_name($senderNames_part);
+ }
+ }
+ } else {
+ $senderName = sqimap_find_displayable_name($msg['FROM']);
}
- }
-
- if( $mailbox == 'None' ) {
- $boxes = sqimap_mailbox_list($imapConnection);
- $mailbox = $boxes[0]['unformatted'];
- unset( $boxes );
- }
- $urlMailbox = urlencode($mailbox);
- $subject = processSubject($msg['SUBJECT']);
- echo "
\n";
-
- if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
- $flag = "";
- $flag_end = '';
- } else {
- $flag = '';
- $flag_end = '';
- }
- if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) {
- $bold = '';
- $bold_end = '';
- } else {
- $bold = '';
- $bold_end = '';
- }
- if (handleAsSent($mailbox)) {
- $italic = '';
- $italic_end = '';
- } else {
- $italic = '';
- $italic_end = '';
- }
- if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
- $fontstr = "";
- $fontstr_end = '';
- } else {
- $fontstr = '';
- $fontstr_end = '';
- }
-
- /**
- * AAAAH! Make my eyes stop bleeding!
- * Who wrote this?!
- */
- if (sizeof($message_highlight_list)){
- foreach ($message_highlight_list as $message_highlight_list_part) {
- if (trim($message_highlight_list_part['value']) != '') {
- if ($message_highlight_list_part['match_type'] == 'to_cc') {
- if (strstr('^^' . strtolower($msg['TO']),
- strtolower($message_highlight_list_part['value']))
- || strstr('^^'.strtolower($msg['CC']),
- strtolower($message_highlight_list_part['value']))) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
- }
- } else
- if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]),
- strtolower($message_highlight_list_part['value']))) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
- }
- }
+
+ $subject = processSubject($msg['SUBJECT']);
+
+ echo html_tag( 'tr' ) . "\n";
+
+ if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
+ $flag = "";
+ $flag_end = '';
+ } else {
+ $flag = '';
+ $flag_end = '';
+ }
+ if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) {
+ $bold = '';
+ $bold_end = '';
+ } else {
+ $bold = '';
+ $bold_end = '';
+ }
+ if (handleAsSent($mailbox)) {
+ $italic = '';
+ $italic_end = '';
+ } else {
+ $italic = '';
+ $italic_end = '';
+ }
+ if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
+ $fontstr = "";
+ $fontstr_end = '';
+ } else {
+ $fontstr = '';
+ $fontstr_end = '';
}
- }
- if (!isset($hlt_color)) {
- $hlt_color = $color_string;
- }
-
- if ($where && $what) {
- if(!isset($pos) || $pos == '') {
- $pos = '0';
+ if ($where && $what) {
+ $searchstr = '&where='.$where.'&what='.$what;
+ } else {
+ $searchstr = '';
+ }
+ /**
+ * AAAAH! Make my eyes stop bleeding!
+ * Who wrote this?!
+ */
+ if (sizeof($message_highlight_list)){
+ foreach ($message_highlight_list as $message_highlight_list_part) {
+ if (trim($message_highlight_list_part['value']) != '') {
+ if ($message_highlight_list_part['match_type'] == 'to_cc') {
+ if (strstr('^^' . strtolower($msg['TO']),
+ strtolower($message_highlight_list_part['value']))
+ || strstr('^^'.strtolower($msg['CC']),
+ strtolower($message_highlight_list_part['value']))) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
+ } else
+ if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]),
+ strtolower($message_highlight_list_part['value']))) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
+ }
+ }
+ }
+
+ if (!isset($hlt_color)) {
+ $hlt_color = $color_string;
}
- $search_stuff = "&pos=" . urlencode($pos)
- . "&where=" . urlencode($where) . '&what=' . urlencode($what);
+
+ $checked = ($checkall == 1) ? ' checked' : '';
+ $row = new html();
+ $row->tag = 'tr';
+ $row->class = 'm_r';
+ $row->id = 'mr'.$t;
+
+
+ if (sizeof($index_order)){
+ foreach ($index_order as $index_order_part) {
+ switch ($index_order_part) {
+ case 1: /* checkbox */
+ echo html_tag( 'td',
+ "",
+ 'center',
+ $hlt_color );
+ break;
+ case 2: /* from */
+ echo html_tag( 'td',
+ $italic . $bold . $flag . $fontstr . $senderName .
+ $fontstr_end . $flag_end . $bold_end . $italic_end,
+ 'left',
+ $hlt_color );
+ break;
+ case 3: /* date */
+ echo html_tag( 'td',
+ $bold . $flag . $fontstr . $msg['DATE_STRING'] .
+ $fontstr_end . $flag_end . $bold_end,
+ 'center',
+ $hlt_color,
+ 'nowrap' );
+ break;
+ case 4: /* subject */
+ $td_str = $bold;
+ if ($thread_sort_messages == 1) {
+ if (isset($indent_array[$msg["ID"]])) {
+ $td_str .= str_repeat(" ",$indent_array[$msg['ID']]);
+ }
+ }
+ $td_str .= '";
+
+ if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
+ $td_str .= _("A");
+ $stuff = true;
+ }
+ if ($msg['TYPE0'] == 'multipart') {
+ $td_str .= '+';
+ $stuff = true;
+ }
+ if ($default_use_priority) {
+ if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
+ $td_str .= "!";
+ $stuff = true;
+ }
+ if ($msg['PRIORITY'] == 5) {
+ $td_str .= "?";
+ $stuff = true;
+ }
+ }
+ if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
+ $td_str .= "D";
+ $stuff = true;
+ }
+ if (!$stuff) {
+ $td_str .= ' ';
+ }
+ $td_str .= '';
+ echo html_tag( 'td',
+ $td_str,
+ 'center',
+ $hlt_color,
+ 'nowrap' );
+ break;
+ case 6: /* size */
+
+ echo html_tag( 'td',
+ $bold . $fontstr . show_readable_size($msg['SIZE']) .
+ $fontstr_end . $bold_end,
+ 'right',
+ $hlt_color );
+ break;
+ }
+ }
+ }
+ echo "
\n";
+}
+
+function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) {
+ $id = get_thread_sort($imapConnection);
+ if ($id != 'no') {
+ if ($start_msg + ($show_num - 1) < $num_msgs) {
+ $end_msg = $start_msg + ($show_num-1);
+ } else {
+ $end_msg = $num_msgs;
+ }
+ $id = array_slice($id, ($start_msg-1), ($end_msg));
+
+ $end = $start_msg + $show_num - 1;
+ if ($num_msgs < $show_num) {
+ $end_loop = $num_msgs;
+ } else if ($end > $num_msgs) {
+ $end_loop = $num_msgs - $start_msg + 1;
+ } else {
+ $end_loop = $show_num;
+ }
+ return fillMessageArray($imapConnection,$id,$end_loop);
} else {
- $search_stuff = '';
+ return false;
}
-
- $checked = ($checkall == 1) ? ' checked' : '';
-
- if (sizeof($index_order)){
- foreach ($index_order as $index_order_part) {
- switch ($index_order_part) {
- case 1: /* checkbox */
- echo " "
- . " | \n";
- break;
- case 2: /* from */
- echo " $italic$bold$flag$fontstr"
- . "$senderName$fontstr_end$flag_end$bold_end$italic_end | \n";
- break;
- case 3: /* date */
- echo " $bold$flag$fontstr"
- . $msg["DATE_STRING"]
- . "$fontstr_end$flag_end$bold_end | \n";
- break;
- case 4: /* subject */
- echo " $bold";
- if ($thread_sort_messages == 1) {
- if (isset($indent_array[$msg["ID"]])) {
- echo str_repeat(" ",$indent_array[$msg["ID"]]);
- }
- }
- echo "$flag$subject$flag_end$bold_end | \n";
- break;
- case 5: /* flags */
- $stuff = false;
- echo " \n";
- if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
- echo _("A") . "\n";
- $stuff = true;
- }
- if ($msg['TYPE0'] == 'multipart') {
- echo "+\n";
- $stuff = true;
- }
- if ($default_use_priority) {
- if ( ($msg['PRIORITY'][0] == 1) || ($msg['PRIORITY'][0] == 2) ) {
- echo "!\n";
- $stuff = true;
- }
- if ($msg['PRIORITY'][0] == 5) {
- echo "?\n";
- $stuff = true;
- }
- }
- if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
- echo "D\n";
- $stuff = true;
- }
- if (!$stuff) {
- echo " \n";
- }
- echo " | \n";
- break;
- case 6: /* size */
- echo " $bold$fontstr"
- . show_readable_size($msg['SIZE']) . "$fontstr_end$bold_end | \n";
- break;
- }
+}
+
+function getServerSortMessages($imapConnection, $start_msg, $show_num,
+ $num_msgs, $server_sort_order, $mbxresponse) {
+ $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse);
+ if ($id != 'no') {
+ if ($start_msg + ($show_num - 1) < $num_msgs) {
+ $end_msg = $start_msg + ($show_num-1);
+ } else {
+ $end_msg = $num_msgs;
+ }
+ $id = array_slice($id, ($start_msg-1), ($end_msg));
+
+ $end = $start_msg + $show_num - 1;
+ if ($num_msgs < $show_num) {
+ $end_loop = $num_msgs;
+ } else if ($end > $num_msgs) {
+ $end_loop = $num_msgs - $start_msg + 1;
+ } else {
+ $end_loop = $show_num;
+ }
+ return fillMessageArray($imapConnection,$id,$end_loop);
+ } else {
+ return false;
+ }
+}
+
+function getSelfSortMessages($imapConnection, $start_msg, $show_num,
+ $num_msgs, $sort, $mbxresponse) {
+ $msgs = array();
+ if ($num_msgs >= 1) {
+ $id = sqimap_get_php_sort_order ($imapConnection, $mbxresponse);
+ if ($sort < 6 ) {
+ $end = $num_msgs;
+ $end_loop = $end;
+ } else {
+ /* if it's not sorted */
+ if ($start_msg + ($show_num - 1) < $num_msgs) {
+ $end_msg = $start_msg + ($show_num - 1);
+ } else {
+ $end_msg = $num_msgs;
+ }
+ if ($end_msg < $start_msg) {
+ $start_msg = $start_msg - $show_num;
+ if ($start_msg < 1) {
+ $start_msg = 1;
+ }
+ }
+ $id = array_slice(array_reverse($id), ($start_msg-1), ($end_msg));
+ $end = $start_msg + $show_num - 1;
+ if ($num_msgs < $show_num) {
+ $end_loop = $num_msgs;
+ } else if ($end > $num_msgs) {
+ $end_loop = $num_msgs - $start_msg + 1;
+ } else {
+ $end_loop = $show_num;
+ }
}
+ $msgs = fillMessageArray($imapConnection,$id,$end_loop);
}
- echo "\n";
+ return $msgs;
}
+
+
/*
* This function loops through a group of messages in the mailbox
* and shows them to the user.
*/
function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
$start_msg, $sort, $color, $show_num,
- $use_cache) {
- global $msgs, $msort,
- $sent_folder, $draft_folder,
- $message_highlight_list,
- $auto_expunge, $thread_sort_messages, $allow_server_sort,
- $data_dir, $username, $server_sort_order;
-
- /* if $start_msg is lower than $num_msgs, we probably deleted all messages
- * in the last page. We need to re-adjust the start_msg
- */
+ $use_cache, $mode='') {
+ global $msgs, $msort, $auto_expunge, $thread_sort_messages,
+ $allow_server_sort, $server_sort_order;
- if($start_msg > $num_msgs) {
- $start_msg -= $show_num;
- if($start_msg < 1) {
- $start_msg = 1;
- }
- }
+ /* If autoexpunge is turned on, then do it now. */
+ $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
+ $srt = $sort;
+ /* If autoexpunge is turned on, then do it now. */
+ if ($auto_expunge == true) {
+ $exp_cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, false, '');
+ $mbxresponse['EXISTS'] = $mbxresponse['EXISTS'] - $exp_cnt;
+ }
+
+ if ($mbxresponse['EXISTS']>0) {
+ /* if $start_msg is lower than $num_msgs, we probably deleted all messages
+ * in the last page. We need to re-adjust the start_msg
+ */
+
+ if($start_msg > $num_msgs) {
+ $start_msg -= $show_num;
+ if($start_msg < 1) {
+ $start_msg = 1;
+ }
+ }
+
+ /* This code and the next if() block check for
+ * server-side sorting methods. The $id array is
+ * formatted and $sort is set to 6 to disable
+ * SM internal sorting
+ */
+
+ if ($thread_sort_messages == 1) {
+ $mode = 'thread';
+ } elseif ($allow_server_sort == 1) {
+ $mode = 'serversort';
+ } else {
+ $mode = '';
+ }
+
+ switch ($mode) {
+ case 'thread':
+ session_unregister('msort');
+ session_unregister('msgs');
+ $msgs = getThreadMessages($imapConnection, $start_msg, $show_num,
+ $num_msgs);
+ if ($msgs === false) {
+ echo '' .
+ _("Thread sorting is not supported by your IMAP server.
Please report this to the system administrator.").
+ '';
+ $thread_sort_messages = 0;
+ $msort = $msgs = array();
+ session_register('msort');
+ session_register('msgs');
+ } else {
+ $msort= $msgs;
+ $sort = 6;
+ session_register('msort');
+ session_register('msgs');
+ }
+
+ break;
+ case 'serversort':
+ $msgs = getServerSortMessages($imapConnection, $start_msg, $show_num,
+ $num_msgs, $sort, $mbxresponse);
+ if ($msgs === false) {
+ echo '' .
+ _( "Server-side sorting is not supported by your IMAP server.
Please report this to the system administrator.").
+ '';
+ $sort = $server_sort_order;
+ $allow_server_sort = FALSE;
+ $msort = $msgs = array();
+ session_register('msort');
+ session_register('msgs');
+ $id = array();
+ } else {
+ $sort = 6;
+ $msort = $msgs;
+ session_register('msort');
+ session_register('msgs');
+ }
+ break;
+ default:
+ if (!$use_cache) {
+ session_unregister('msgs');
+ session_unregister('msort');
+ $msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num,
+ $num_msgs, $sort, $mbxresponse);
+ $msort = calc_msort($msgs, $sort);
+ session_register('msort');
+ session_register('msgs');
+ } /* !use cache */
+ break;
+ } // switch
+ } /* if exists > 0 */
+
+ $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
+
+ $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg,
+ $num_msgs, $show_num, $sort);
- /* This code and the next if() block check for
- * server-side sorting methods. The $id array is
- * formatted and $sort is set to 6 to disable
- * SM internal sorting
+ $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs);
+
+ do_hook('mailbox_index_before');
+
+ mail_message_listing_beginning($imapConnection, $mailbox, $sort,
+ $msg_cnt_str, $paginator_str, $start_msg);
+
+
+ printHeader($mailbox, $srt, $color, !$thread_sort_messages);
+
+ displayMessageArray($imapConnection, $num_msgs, $start_msg,
+ $msort, $mailbox, $sort, $color, $show_num,0,0);
+
+ mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
+
+ /**
+ * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series.
*/
- if ($thread_sort_messages == 1) {
- $id = get_thread_sort($imapConnection);
- if ($id == 'no') {
- echo 'Thread sorting is not'.
- ' supported by your IMAP server.
Please report this'.
- 'to the system administrator.';
- $thread_sort_messages = 0;
- $id = array();
- }
- else {
- $sort = 6;
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- }
- else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
- }
- }
+}
- if ($allow_server_sort == TRUE && $thread_sort_messages != 1) {
- $server_sort_order = $sort;
- $id = sqimap_get_sort_order($imapConnection, $server_sort_order);
- if ($id == 'no') {
- echo 'Server-side sorting '.
- 'is not supported by your IMAP server.
Please report this'.
- ' to the system administrator.';
- $sort = $server_sort_order;
- $allow_server_sort = FALSE;
- $id = array();
- }
- else {
- $sort = 6;
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- }
- else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
- }
+function calc_msort($msgs, $sort) {
+
+ /*
+ * 0 = Date (up)
+ * 1 = Date (dn)
+ * 2 = Name (up)
+ * 3 = Name (dn)
+ * 4 = Subject (up)
+ * 5 = Subject (dn)
+ */
+ if (($sort == 0) || ($sort == 1)) {
+ $msort = array_cleave ($msgs, 'TIME_STAMP');
+ } elseif (($sort == 2) || ($sort == 3)) {
+ $msort = array_cleave ($msgs, 'FROM-SORT');
+ } elseif (($sort == 4) || ($sort == 5)) {
+ $msort = array_cleave ($msgs, 'SUBJECT-SORT');
+ } else {
+ $msort = $msgs;
}
+ if ($sort < 6) {
+ if ($sort % 2) {
+ asort($msort);
+ } else {
+ arsort($msort);
+ }
+ }
+ return $msort;
+}
- /* If autoexpunge is turned on, then do it now. */
- if ($auto_expunge == true) {
- sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+function fillMessageArray($imapConnection,$id,$count) {
+ $msgs_list = sqimap_get_small_header_list($imapConnection, $id);
+ $messages = array();
+ if (sizeof($msgs_list)){
+ foreach ($msgs_list as $hdr) {
+ $unique_id[] = $hdr->uid;
+ $from[] = $hdr->from;
+ $date[] = $hdr->date;
+ $subject[] = $hdr->subject;
+ $to[] = $hdr->to;
+ $priority[] = $hdr->priority;
+ $cc[] = $hdr->cc;
+ $size[] = $hdr->size;
+ $type[] = $hdr->type0;
+ $flag_deleted[] = $hdr->flag_deleted;
+ $flag_answered[] = $hdr->flag_answered;
+ $flag_seen[] = $hdr->flag_seen;
+ $flag_flagged[] = $hdr->flag_flagged;
+ }
}
- sqimap_mailbox_select($imapConnection, $mailbox);
- $issent = handleAsSent($mailbox);
- if (!$use_cache) {
- /* If it is sorted... */
- if ($num_msgs >= 1) {
- if ($sort < 6 ) {
- $id = range(1, $num_msgs);
- }
- elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE && $sort == 6) {
- /* if it's not sorted */
- if ($start_msg + ($show_num - 1) < $num_msgs){
- $end_msg = $start_msg + ($show_num - 1);
- } else {
- $end_msg = $num_msgs;
- }
- if ($end_msg < $start_msg) {
- $start_msg = $start_msg - $show_num;
- if ($start_msg < 1) {
- $start_msg = 1;
- }
- }
+
+ $j = 0;
+ while ($j < $count) {
- $real_startMessage = $num_msgs - $start_msg + 1;
- $real_endMessage = $num_msgs - $start_msg - $show_num + 2;
- if ($real_endMessage <= 0) {
- $real_endMessage = 1;
- }
- $id = array_reverse(range($real_endMessage, $real_startMessage));
- }
- $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
- $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
- if (sizeof($msgs_list)){
- foreach ($msgs_list as $hdr) {
- $from[] = $hdr->from;
- $date[] = $hdr->date;
- $subject[] = $hdr->subject;
- $to[] = $hdr->to;
- $priority[] = $hdr->priority;
- $cc[] = $hdr->cc;
- $size[] = $hdr->size;
- $type[] = $hdr->type0;
- }
- }
- }
- $j = 0;
- if ($sort == 6) {
- $end = $start_msg + $show_num - 1;
- if ($num_msgs < $show_num) {
- $end_loop = $num_msgs;
- } else if ($end > $num_msgs) {
- $end_loop = $num_msgs - $start_msg + 1;
- } else {
- $end_loop = $show_num;
- }
- } else {
- $end = $num_msgs;
- $end_loop = $end;
- }
- while ($j < $end_loop) {
if (isset($date[$j])) {
$date[$j] = str_replace(' ', ' ', $date[$j]);
$tmpdate = explode(' ', trim($date[$j]));
} else {
$tmpdate = $date = array('', '', '', '', '', '');
}
-
$messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate);
$messages[$j]['DATE_STRING'] =
getDateString($messages[$j]['TIME_STAMP']);
- $messages[$j]['ID'] = $id[$j];
+ $messages[$j]['ID'] = $unique_id[$j];
$messages[$j]['FROM'] = decodeHeader($from[$j]);
$messages[$j]['FROM-SORT'] =
strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
@@ -375,6 +531,11 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
$messages[$j]['CC'] = $cc[$j];
$messages[$j]['SIZE'] = $size[$j];
$messages[$j]['TYPE0'] = $type[$j];
+ $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j];
+ $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j];
+ $messages[$j]['FLAG_SEEN'] = $flag_seen[$j];
+ $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j];
+
/*
* fix SUBJECT-SORT to remove Re:
@@ -385,154 +546,35 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
* we know about, but also define in i18n what the localized
* "Re: " is for this or that locale.
*/
- if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si",
+ if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si",
$messages[$j]['SUBJECT-SORT'], $matches)){
- $messages[$j]['SUBJECT-SORT'] = $matches[2];
- }
-
- $num = 0;
- while ($num < count($flags[$j])) {
- if ($flags[$j][$num] == 'Deleted') {
- $messages[$j]['FLAG_DELETED'] = true;
- } else if ($flags[$j][$num] == 'Answered') {
- $messages[$j]['FLAG_ANSWERED'] = true;
- } else if ($flags[$j][$num] == 'Seen') {
- $messages[$j]['FLAG_SEEN'] = true;
- } else if ($flags[$j][$num] == 'Flagged') {
- $messages[$j]['FLAG_FLAGGED'] = true;
- }
- $num++;
- }
- $j++;
- }
-
- /*
- * Only ignore messages flagged as deleted if we are
- * using a trash folder or auto_expunge
- */
- if (((isset($move_to_trash) && $move_to_trash)
- || (isset($auto_expunge) && $auto_expunge))
- && $sort != 6) {
-
- /* Find and remove the ones that are deleted */
- $i = 0;
- $j = 0;
-
- while ($j < $num_msgs) {
- if (isset($messages[$j]['FLAG_DELETED'])
- && $messages[$j]['FLAG_DELETED'] == true) {
- $j++;
- continue;
- }
- $msgs[$i] = $messages[$j];
-
- $i++;
- $j++;
- }
- $num_msgs = $i;
- } else {
- if (!isset($messages)) {
- $messages = array();
- }
- $msgs = $messages;
- }
- }
-
- /* There's gotta be messages in the array for it to sort them. */
- if (($num_msgs > 0) && (!$use_cache)) {
- /*
- * 0 = Date (up)
- * 1 = Date (dn)
- * 2 = Name (up)
- * 3 = Name (dn)
- * 4 = Subject (up)
- * 5 = Subject (dn)
- */
- session_unregister('msgs');
- if (($sort == 0) || ($sort == 1)) {
- $msort = array_cleave ($msgs, 'TIME_STAMP');
- } elseif (($sort == 2) || ($sort == 3)) {
- $msort = array_cleave ($msgs, 'FROM-SORT');
- } elseif (($sort == 4) || ($sort == 5)) {
- $msort = array_cleave ($msgs, 'SUBJECT-SORT');
- } else {
- $msort = $msgs;
- }
-
- if ($sort < 6) {
- if ($sort % 2) {
- asort($msort);
- } else {
- arsort($msort);
- }
- }
- session_register('msort');
- } elseif ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
- $msort = $msgs;
- session_unregister('msgs');
- session_register('msort');
+ $messages[$j]['SUBJECT-SORT'] = $matches[2];
+ }
+ $j++;
}
- displayMessageArray($imapConnection, $num_msgs, $start_msg, $msgs,
- $msort, $mailbox, $sort, $color,$show_num);
- /**
- * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series.
- */
- session_register('msgs');
+ return $messages;
}
+
/* Generic function to convert the msgs array into an HTML table. */
function displayMessageArray($imapConnection, $num_msgs, $start_msg,
- &$msgs, $msort, $mailbox, $sort, $color,
- $show_num) {
- global $folder_prefix, $sent_folder,
- $imapServerAddress, $data_dir, $username, $use_mailbox_cache,
- $index_order, $real_endMessage, $real_startMessage, $checkall,
- $indent_array, $thread_sort_messages, $allow_server_sort, $server_sort_order;
-
- /* If cache isn't already set, do it now. */
- if (!session_is_registered('msgs')) {
- session_register('msgs');
- }
- if (!session_is_registered('msort')) {
- session_register('msort');
- }
-
- if ($start_msg + ($show_num - 1) < $num_msgs){
- $end_msg = $start_msg + ($show_num - 1);
- } else {
- $end_msg = $num_msgs;
- }
+ $msort, $mailbox, $sort, $color,
+ $show_num, $where=0, $what=0) {
+ global $imapServerAddress, $use_mailbox_cache,
+ $index_order, $checkall,
+ $indent_array, $thread_sort_messages, $allow_server_sort,
+ $server_sort_order, $PHP_SELF;
- if ($end_msg < $start_msg) {
- $start_msg = $start_msg - $show_num;
- if ($start_msg < 1) {
- $start_msg = 1;
- }
- }
+ $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
$urlMailbox = urlencode($mailbox);
- do_hook('mailbox_index_before');
-
- $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs);
- $paginator_str = get_paginator_str($urlMailbox, $start_msg, $end_msg,
- $num_msgs, $show_num, $sort);
-
- if (!isset($msg)) {
- $msg = '';
- }
-
/* get indent level for subject display */
if ($thread_sort_messages == 1 ) {
$indent_array = get_parent_level($imapConnection);
}
- $fstring = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
- . "&startMessage=$start_msg";
- mail_message_listing_beginning($imapConnection, $fstring,
- $mailbox, $sort, $msg_cnt_str,
- $paginator_str, $start_msg);
- $groupNum = $start_msg % ($show_num - 1);
+
$real_startMessage = $start_msg;
if ($sort == 6) {
if ($end_msg - $start_msg < $show_num - 1) {
@@ -550,13 +592,19 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
* ($t is used for the checkbox number)
*/
$t = 0;
+
+ /* messages display */
+
if ($num_msgs == 0) {
/* if there's no messages in this folder */
- echo "\n"
- . " ". _("THIS FOLDER IS EMPTY")
- . " \n"
- . " |
";
+ echo html_tag( 'tr',
+ html_tag( 'td',
+ "
" . _("THIS FOLDER IS EMPTY") . "
",
+ 'center',
+ $color[4],
+ 'COLSPAN="' . count($index_order) . '"'
+ )
+ );
} elseif ($start_msg == $end_msg) {
/* if there's only one message in the box, handle it differently. */
if ($sort != 6){
@@ -571,8 +619,8 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort,
- $real_startMessage, 0, 0);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox,
+ $real_startMessage, $where, $what);
} else {
$i = $start_msg;
reset($msort);
@@ -584,25 +632,14 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
} while (isset ($key) && ($k < $i));
do {
printMessageInfo($imapConnection, $t, $i, $key, $mailbox,
- $sort, $real_startMessage, 0, 0);
+ $real_startMessage, $where, $what);
$key = key($msort);
$t++;
$i++;
next($msort);
} while ($i && $i < $endVar);
}
-
- echo ''
- . ""
- . "$paginator_str | "
- . "$msg_cnt_str | "
- . " |
";
- /* End of message-list table */
-
- do_hook('mailbox_index_after');
- echo "\n";
+ echo '';
}
/*
@@ -615,160 +652,197 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
* $Message is a message that is centered on top of the list
* $More is a second line that is left aligned
*/
-function mail_message_listing_beginning ($imapConnection, $moveURL,
+
+function mail_message_listing_beginning ($imapConnection,
$mailbox = '', $sort = -1,
$msg_cnt_str = '',
$paginator = ' ',
$start_msg = 1) {
- global $color, $index_order, $auto_expunge, $move_to_trash, $base_uri,
- $checkall, $sent_folder, $draft_folder, $thread_sort_messages,
- $allow_thread_sort, $allow_server_sort, $server_sort_order;
+ global $color, $auto_expunge, $base_uri, $thread_sort_messages,
+ $allow_thread_sort, $allow_server_sort, $server_sort_order,
+ $PHP_SELF;
+
$urlMailbox = urlencode($mailbox);
+ if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
+ $source_url = $regs[1];
+ } else {
+ $source_url = $PHP_SELF;
+ }
+
+ if (!isset($msg)) {
+ $msg = '';
+ }
+ $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
+ . "&startMessage=$start_msg";
+
/*
* This is the beginning of the message list table.
* It wraps around all messages
*/
- echo "