X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=32f51bffcbdeca24fab570691bdf839028429b13;hp=1e1fd41763b7ee9365a13bb341661ec421e6e789;hb=3ab69ec41597545673558f7bc87527aca061d47d;hpb=794d59c03f4269cdbb49e0789e94a9368a7b0a24 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 1e1fd417..32f51bff 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,348 +12,520 @@ * $Id$ */ -require_once('../functions/strings.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'class/html.class.php'); +require_once(SM_PATH . '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 .= '!"; + $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; - - /* 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) { - $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)); - } + $use_cache, $mode='') { + global $msgs, $msort, $auto_expunge, $thread_sort_messages, + $allow_server_sort, $server_sort_order; + + /* 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; + $num_msgs = $mbxresponse['EXISTS']; } - 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)); - } + 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': + sqsession_unregister('msort'); + sqsession_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(); + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + } else { + $msort= $msgs; + $sort = 6; + sqsession_register($msort, 'msort'); + sqsession_register($msgs, '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(); + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + $id = array(); + } else { + $sort = 6; + $msort = $msgs; + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + } + break; + default: + if (!$use_cache) { + sqsession_unregister('msgs'); + sqsession_unregister('msort'); + $msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num, + $num_msgs, $sort, $mbxresponse); + $msort = calc_msort($msgs, $sort); + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + } /* !use cache */ + break; + } // switch + } /* if exists > 0 */ + + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; + + $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg, + $num_msgs, $show_num, $sort); + + $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); + + + echo '
'; + 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); + echo '
'; + + /** + * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. + */ +} + +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]))); @@ -364,6 +536,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: @@ -374,154 +551,37 @@ 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; - } - } + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; $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) { @@ -539,13 +599,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){ @@ -560,8 +626,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); @@ -573,25 +639,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 ''; } /* @@ -604,160 +659,200 @@ 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; + + $php_self = $PHP_SELF; + /* fix for incorrect $PHP_SELF */ + if (strpos($php_self, 'move_messages.php')) { + $php_self = str_replace('move_messages.php', 'right_main.php', $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 "
\n" - . "\n' - . "' - . "' + . html_tag( 'tr' ) + . html_tag( 'td' ,'' , '', $color[0], '' ); + + /* if using server sort we highjack the + * the $sort var and use $server_sort_order + * instead. but here we reset sort for a bit + * since its easy + */ + if ($allow_server_sort == TRUE) { + $sort = $server_sort_order; } +} + +function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { + if ($num_msgs) { + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', $paginator_str ) . + html_tag( 'td', $msg_cnt_str, 'right' ) + ) + , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' ) + ) + , '', $color[4] ) + , '', $color[9], 'width="100%" cellpadding="1" cellspacing="1"' ); + } - /* if using server-sorting, - * send sort back to 6 - */ - if ($allow_server_sort == TRUE) { - $sort = 6; - } - echo "\n"; + /* End of message-list table */ + + do_hook('mailbox_index_after'); + echo "\n"; + } +function printHeader($mailbox, $sort, $color, $showsort=true) { + global $index_order; + echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); + echo html_tag( 'tr' ,'' , 'center', $color[5] ); + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: /* checkbox */ + case 5: /* flags */ + echo html_tag( 'td' ,' ' , '', '', 'width="1%"' ); + break; + case 2: /* from */ + if (handleAsSent($mailbox)) { + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("To") . ''; + } else { + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("From") . ''; + } + if ($showsort) { + ShowSortButton($sort, $mailbox, 2, 3); + } + echo "\n"; + break; + case 3: /* date */ + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + . '' . _("Date") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, 0, 1); + } + echo "\n"; + break; + case 4: /* subject */ + echo html_tag( 'td' ,'' , 'left', '', '' ) + . '' . _("Subject") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, 4, 5); + } + echo "\n"; + break; + case 6: /* size */ + echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); + break; + } + } + echo "\n"; +} + + /* * This function shows the sort button. Isn't this a good comment? */ -function ShowSortButton($sort, $mailbox, $Up, $Down) { +function ShowSortButton($sort, $mailbox, $Up, $Down ) { + global $PHP_SELF; /* Figure out which image we want to use. */ if ($sort != $Up && $sort != $Down) { $img = 'sort_none.png'; @@ -770,11 +865,17 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) { $which = 6; } + if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { + $source_url = $regs[1]; + } else { + $source_url = $PHP_SELF; + } + /* Now that we have everything figured out, show the actual button. */ - echo ' '; + . '" BORDER=0 WIDTH=12 HEIGHT=10 ALT="sort">'; } function get_selectall_link($start_msg, $sort) { @@ -845,7 +946,6 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { } else { $result = '
'; } - /* Return our result string. */ return ($result); } @@ -854,10 +954,24 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { * Generate a paginator link. */ function get_paginator_link($box, $start_msg, $use, $text) { + global $PHP_SELF; + $result = "$text"; return ($result); +/* + if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { + $source_url = $regs[1]; + } else { + $source_url = $PHP_SELF; + } + + $result = '$text"; + return ($result); +*/ } /* @@ -874,6 +988,8 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, $all_str = ''; $tgl_str = ''; + $box = urlencode($box); + /* Create simple strings that will be creating the paginator. */ $spc = ' '; /* This will be used as a space. */ $sep = '|'; /* This will be used as a seperator. */ @@ -1060,6 +1176,7 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, } function processSubject($subject) { + global $languages, $squirrelmail_language; /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') return _("(no subject)"); @@ -1087,9 +1204,64 @@ function processSubject($subject) { return $subject; } + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val); + } + return substr($subject, 0, $trim_val) . '...'; } +function getMbxList($imapConnection) { + global $lastTargetMailbox; + echo '   '; +} + +function getButton($type, $name, $value) { +return ''; +} + +function getSmallStringCell($string, $align) { + return html_tag( 'td', + '' . $string . ':  ', + $align, + '', + 'nowrap' ); +} + +function getEndMessage($start_msg, $show_num, $num_msgs) { + 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; + } + } + return (array($start_msg,$end_msg)); +} + function handleAsSent($mailbox) { global $sent_folder, $draft_folder, $handleAsSent_result;
" - . " \n" - . " \n" - . "
$paginator\n"; - - echo " $msg_cnt_str
\n" - . '
\n" - . "\n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n"; + + echo getButton('SUBMIT', 'markRead',_("Read")); + echo getButton('SUBMIT', 'markUnread',_("Unread")); + echo getButton('SUBMIT', 'delete',_("Delete")) ." \n"; + if (!strpos($php_self,'mailbox')) { + $location = $php_self.'?mailbox=INBOX&startMessage=1'; + } else { + $location = $php_self; + } + echo ''; + echo "\n" + . " \n"; /* draws thread sorting links */ if ($allow_thread_sort == TRUE) { if ($thread_sort_messages == 1 ) { $set_thread = 2; - $thread_name = 'Unthread View'; + $thread_name = _("Unthread View"); } elseif ($thread_sort_messages == 0) { $set_thread = 1; - $thread_name = 'Thread View'; + $thread_name = _("Thread View"); } - echo ''; + echo html_tag( 'tr' , + html_tag( 'td' , + ' ' . $thread_name + . ' ' + , '', '', '' ) + , '', '', '' ); } echo "
\n" - . '  ' . _("Move Selected To:") . "\n" - . " \n" - . '  ' . _("Transform Selected Messages") - . ":  
\n" - . "
\n" - . '   ' - . ' ' - . ' \n" . "\n"; + echo "\n" + . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . + html_tag( 'tr', + html_tag( 'td' , + html_tag( 'table' , + html_tag( 'tr', + html_tag( 'td', $paginator, 'left' ) . + html_tag( 'td', $msg_cnt_str, 'right' ) + ) + , '', $color[4], 'border="0" width="100%" cellpadding="2" cellspacing="0"' ) + , 'left', '', '' ) + , '', $color[0] ) + . html_tag( 'tr' ) . "\n" + . html_tag( 'td' ,'' , 'left', $color[0], '' ) + . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0" cellspacing="0"' ) + . html_tag( 'tr', + getSmallStringCell(_("Move Selected To $mailbox"), 'left') . + getSmallStringCell(_("Transform Selected Messages"), 'right') + ) + . html_tag( 'tr' ) ."\n" + . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' ); + getMbxList($imapConnection); + echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; + echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; echo " "; + . html_tag( 'td', '', 'right', '', 'nowrap' ); + if (!$auto_expunge) { - echo ' ' . _("mailbox") . ' '; + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) + .' ' . _("mailbox") . "\n"; } - echo '' - . '' - . ' ' - . "
 ' . _("$thread_name") - . ' 
\n"; - do_hook('mailbox_form_before'); - echo '
" - . '" - . ""; - /* if using server sort we highjack the - * the $sort var and use $server_sort_order - * instead. but here we reset sort for a bit - * since its easy - */ - if ($allow_server_sort == TRUE) { - $sort = $server_sort_order; - } - /* Print the headers. */ - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - case 1: /* checkbox */ - case 5: /* flags */ - echo ' '; - break; - case 2: /* from */ - if (handleAsSent($mailbox)) { - echo ' \n"; - break; - case 3: /* date */ - echo ' \n"; - break; - case 4: /* subject */ - echo ' \n"; - break; - case 6: /* size */ - echo ' \n"; - break; + + echo "
 ' . _("To") . ''; - } else { - echo ' ' . _("From") . ''; - } - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 2, 3); - } - echo "' . _("Date") . ''; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 0, 1); - } - echo "' . _("Subject") . ' '; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 4, 5); - } - echo "' . _("Size") . "
\n"; + + do_hook('mailbox_form_before'); + + echo '