X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=1d04af2a25e5f21a5785eb9a11c43c55058c43f6;hp=7495032b10b60c4dedec3ba2121fcb2b5e56e5a3;hb=09ac2863d273b0a3954769e11c5b8535763e5827;hpb=7c612fdd06ef01a509e7691e2cf373e7910f1d48 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 7495032b..1d04af2a 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -3,7 +3,7 @@ /** * mailbox_display.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains functions that display mailbox information, such as the @@ -12,28 +12,35 @@ * $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'); -define('PG_SEL_MAX', 10); /* Default value for page_selector_max. */ +/* 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, +function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, + $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 */ - $color_string = $color[4]; + $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($GLOBALS['row_count'])) { - $GLOBALS['row_count'] = 0; + if (!isset($row_count)) { + $row_count = 0; } - $GLOBALS['row_count']++; - if ($GLOBALS['row_count'] % 2) { + $row_count++; + if ($row_count % 2) { if (!isset($color[12])) { $color[12] = '#EAEAEA'; } @@ -42,29 +49,36 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start } $msg = $msgs[$key]; - /** - * This is done in case you're looking into Sent folders, - * because you can have multi receiver. - */ - $sendersName = split(',', $msg['FROM']); - $senderName = ''; - for ($index = 0 ; $index < count($sendersName) ; $index++) { - if ($senderName != '') { - $senderName .= ', '; - } - $senderName .= sqimap_find_displayable_name($sendersName[$index]); - } - - if( $mailbox == 'None' ) { - // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - $boxes = sqimap_mailbox_list($imapConnection); - // sqimap_logout($imapConnection); + if($mailbox == 'None') { + $boxes = sqimap_mailbox_list($imapConnection); $mailbox = $boxes[0]['unformatted']; - unset( $boxes ); + unset($boxes); } $urlMailbox = urlencode($mailbox); - $subject = processSubject($msg['SUBJECT']); - echo "\n"; + + 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']); + } + + $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]); + + echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { $flag = ""; @@ -80,7 +94,6 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start $bold = ''; $bold_end = ''; } - if (handleAsSent($mailbox)) { $italic = ''; $italic_end = ''; @@ -88,7 +101,6 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start $italic = ''; $italic_end = ''; } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { $fontstr = ""; $fontstr_end = ''; @@ -97,16 +109,32 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start $fontstr_end = ''; } - for ($i=0; $i < count($message_highlight_list); $i++) { - if (trim($message_highlight_list[$i]['value']) != '') { - if ($message_highlight_list[$i]['match_type'] == 'to_cc') { - if (strpos('^^'.strtolower($msg['TO']), strtolower($message_highlight_list[$i]['value'])) || strpos('^^'.strtolower($msg['CC']), strtolower($message_highlight_list[$i]['value']))) { - $hlt_color = $message_highlight_list[$i]['color']; - continue; - } - } else if (strpos('^^'.strtolower($msg[strtoupper($message_highlight_list[$i]['match_type'])]),strtolower($message_highlight_list[$i]['value']))) { - $hlt_color = $message_highlight_list[$i]['color']; - continue; + if ($where && $what) { + $searchstr = '&where='.$where.'&what='.$what; + } else { + $searchstr = ''; + } + /** + * AAAAH! Make my eyes stop bleeding! + * Who wrote this?! + */ + if (is_array($message_highlight_list) && count($message_highlight_list)){ + foreach ($message_highlight_list as $message_highlight_list_part) { + if (trim($message_highlight_list_part['value']) != '') { + $high_val = strtolower($message_highlight_list_part['value']); + $match_type = strtoupper($message_highlight_list_part['match_type']); + if ($match_type == 'TO_CC') { + if (strstr('^^' . strtolower($msg['TO']), $high_val) || + strstr('^^' . strtolower($msg['CC']), $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } else { + if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } } } } @@ -114,160 +142,168 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start if (!isset($hlt_color)) { $hlt_color = $color_string; } - - if ($where && $what) { - if( !isset( $pos ) || $pos == '' ) { - $pos = '0'; - } - $search_stuff = "&pos=" . urlencode( $pos ) . "&where=".urlencode($where).'&what='.urlencode($what); - } - - $checked = ($checkall == 1 ?' checked' : ''); - - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - 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 (! isset($search_stuff)) { $search_stuff = ''; } - if ($thread_sort_messages == 1) { - 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 (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) { - echo "!\n"; + $checked = ($checkall == 1) ? ' CHECKED' : ''; + $col = 0; + 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 . htmlentities($senderName) . + $fontstr_end . $flag_end . $bold_end . $italic_end, + 'left', + $hlt_color ); + break; + case 3: /* date */ + $date_string = $msg['DATE_STRING'] . ''; + if ($date_string == '') { + $date_string = _("Unknown date"); + } + echo html_tag( 'td', + $bold . $flag . $fontstr . $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 .= '?
\n"; + 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; } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { - 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; + ++$col; } } - echo "\n"; + if ($not_last) { + echo '' . "\n" . '' . "\n"; + } else { + echo ''."\n"; + } } -/** - * 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, - $data_dir, $username; - /* If autoexpunge is turned on, then do it now. */ - - - if ($thread_sort_messages == 1 ) { - $id = get_thread_sort($imapConnection); - $sort = 6; +function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) { + if ($id != 'no') { if ($start_msg + ($show_num - 1) < $num_msgs) { $end_msg = $start_msg + ($show_num-1); - } - else { + } 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; } - if ($auto_expunge == true) { - sqimap_mailbox_expunge($imapConnection, $mailbox, false); - } - 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) { - // 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; - } - } +function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { + $id = get_thread_sort($imapConnection); + return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); +} - $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)); +function getServerSortMessages($imapConnection, $start_msg, $show_num, + $num_msgs, $server_sort_order, $mbxresponse) { + $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse); + return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); +} + +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; } - $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent); - $flags = sqimap_get_flags_list($imapConnection, $id, $issent); - 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; + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { + $start_msg = 1; + } } - } - $j = 0; - if ($sort == 6) { + $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; @@ -276,165 +312,199 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $start_msg } 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('', '', '', '', '', ''); - } + $msgs = fillMessageArray($imapConnection,$id,$end_loop); + } + return $msgs; +} - $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); - $messages[$j]['DATE_STRING'] = getDateString($messages[$j]['TIME_STAMP']); - $messages[$j]['ID'] = $id[$j]; - $messages[$j]['FROM'] = decodeHeader($from[$j]); - $messages[$j]['FROM-SORT'] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); - $messages[$j]['SUBJECT'] = decodeHeader($subject[$j]); - $messages[$j]['SUBJECT-SORT'] = strtolower(decodeHeader($subject[$j])); - $messages[$j]['TO'] = decodeHeader($to[$j]); - $messages[$j]['PRIORITY'] = $priority[$j]; - $messages[$j]['CC'] = $cc[$j]; - $messages[$j]['SIZE'] = $size[$j]; - $messages[$j]['TYPE0'] = $type[$j]; - - # fix SUBJECT-SORT to remove Re: - $re_abbr = /* Add more here! */ - 'vedr|sv|' . /* Danish */ - 're|aw'; /* English */ - - if (eregi( "^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs)) { - $messages[$j]['SUBJECT-SORT'] = $regs[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++; + +/* + * 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, $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 ($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; } - $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; + /* 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 { - if (!isset($messages)) { - $messages = array(); - } - $msgs = $messages; + $mode = ''; } - } - // There's gotta be messages in the array for it to sort them. - if ($num_msgs > 0 && ! $use_cache && $thread_sort_messages != 1) { - /** 0 = Date (up) 4 = Subject (up) - ** 1 = Date (dn) 5 = Subject (dn) - ** 2 = Name (up) - ** 3 = Name (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 { // ($sort == 6) - $msort = $msgs; - } + sqsession_unregister('msort'); + sqsession_unregister('msgs'); + switch ($mode) { + case 'thread': + $id = get_thread_sort($imapConnection); + $msgs = getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); + 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(); + } else { + $msort= $msgs; + $sort = 6; + } + break; + case 'serversort': + $id = sqimap_get_sort_order($imapConnection, $sort, $mbxresponse); + $msgs = getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); + 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(); + $id = array(); + } else { + $msort = $msgs; + $sort = 6; + } + break; + default: + if (!$use_cache) { + $msgs = getSelfSortMessages($imapConnection, $start_msg, $show_num, + $num_msgs, $sort, $mbxresponse); + $msort = calc_msort($msgs, $sort); + } /* !use cache */ + break; + } // switch + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + } /* 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); - if ($sort < 6) { - if ($sort % 2) { - asort($msort); - } - else { - arsort($msort); - } - } - session_register('msort'); - } - elseif ($thread_sort_messages == 1 ) { - $msort = $msgs; - session_unregister('msgs'); - session_register('msort'); - } - displayMessageArray($imapConnection, $num_msgs, $start_msg, $msgs, $msort, $mailbox, $sort, $color,$show_num); - session_register('msgs'); + $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); + + do_hook('mailbox_index_before'); + echo ''; + echo ''; + /* line between the button area and the list */ + echo ''; + + echo '
'; + + mail_message_listing_beginning($imapConnection, $mailbox, $sort, + $msg_cnt_str, $paginator_str, $start_msg); + echo '
'; + echo ' '; + echo '
'; + echo ' '; + echo '
'; + printHeader($mailbox, $srt, $color, !$thread_sort_messages); + + displayMessageArray($imapConnection, $num_msgs, $start_msg, + $msort, $mailbox, $sort, $color, $show_num,0,0); + echo '
'; + + mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); + echo '
'; } -/** - * 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; - global $imapServerAddress, $data_dir, $username, $use_mailbox_cache; - global $index_order, $real_endMessage, $real_startMessage, $checkall; - global $indent_array, $thread_sort_messages; - - /* 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); +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)) { + foreach ($msgs as $item) { + $msort[] = $item['TIME_STAMP']; + } + } elseif (($sort == 2) || ($sort == 3)) { + foreach ($msgs as $item) { + $msort[] = $item['FROM-SORT']; + } + } elseif (($sort == 4) || ($sort == 5)) { + foreach ($msgs as $item) { + $msort[] = $item['SUBJECT-SORT']; + } } else { - $end_msg = $num_msgs; + $msort = $msgs; } - - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { $start_msg = 1; } + if ($sort < 6) { + if ($sort % 2) { + asort($msort); + } else { + arsort($msort); + } } + return $msort; +} - $urlMailbox = urlencode($mailbox); +function fillMessageArray($imapConnection, $id, $count) { + return sqimap_get_small_header_list($imapConnection, $id); +} - 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); +/* Generic function to convert the msgs array into an HTML table. */ +function displayMessageArray($imapConnection, $num_msgs, $start_msg, + $msort, $mailbox, $sort, $color, + $show_num, $where=0, $what=0) { + global $imapServerAddress, $use_mailbox_cache, $index_order, + $indent_array, $thread_sort_messages, $allow_server_sort, + $server_sort_order, $PHP_SELF; - if (! isset($msg)) { - $msg = ''; - } + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; + + $urlMailbox = urlencode($mailbox); /* get indent level for subject display */ - if ($thread_sort_messages == 1 ) { + if ($thread_sort_messages == 1 && $num_msgs) { $indent_array = get_parent_level($imapConnection); } - mail_message_listing_beginning( $imapConnection, - "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$start_msg", - $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) { @@ -447,20 +517,31 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms } $endVar = $end_msg + 1; - /* Loop through and display the info for each message. */ - $t = 0; // $t is used for the checkbox number - if ($num_msgs == 0) { // if there's no messages in this folder - echo "\n". - "

". _("THIS FOLDER IS EMPTY") ."
 
\n". - ""; + /* + * Loop through and display the info for each message. + * ($t is used for the checkbox number) + */ + $t = 0; + + /* messages display */ + + if (!$num_msgs) { + /* if there's no messages in this folder */ + 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 there's only one message in the box, handle it differently. */ if ($sort != 6) { $i = $start_msg; } else { $i = 1; } - reset($msort); $k = 0; do { @@ -468,10 +549,10 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms next($msort); $k++; } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); + printMessageInfo($imapConnection, $t, true, $key, $mailbox, + $real_startMessage, $where, $what); } else { $i = $start_msg; - reset($msort); $k = 0; do { @@ -479,30 +560,20 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms next($msort); $k++; } while (isset ($key) && ($k < $i)); - + $not_last = true; do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); + if (!$i || $i == $endVar-1) $not_last = false; + printMessageInfo($imapConnection, $t, $not_last, $key, $mailbox, + $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"; } -/** +/* * Displays the standard message list header. To finish the table, * you need to do a ""; * @@ -512,141 +583,217 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms * $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, $mailbox = '', $sort = -1, - $msg_cnt_str = '', $paginator = ' ', $start_msg = 1) { - global $color, $index_order, $auto_expunge, $move_to_trash, $base_uri; - global $checkall, $sent_folder, $draft_folder, $thread_sort_messages, $allow_thread_sort; + +function mail_message_listing_beginning ($imapConnection, + $mailbox = '', $sort = -1, + $msg_cnt_str = '', + $paginator = ' ', + $start_msg = 1) { + 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 = ''; + } + $moveFields = '' . + '' . + ''; + +// $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" - . "
" - . " \n" - . " '; + + echo '\n" + . html_tag( 'td', '', 'right', '', 'nowrap' ); + + + + if (!$auto_expunge) { + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) + .' ' . _("mailbox") . "\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'; - } - elseif ($thread_sort_messages == 0) { + $thread_name = _("Unthread View"); + } elseif ($thread_sort_messages == 0) { $set_thread = 1; - $thread_name = 'Thread View'; + $thread_name = _("Thread View"); + } + echo html_tag( 'tr' , + html_tag( 'td' , + ' ' . $thread_name + . ' ' + , '', '', '' ) + , '', '', '' ); } - echo '| '._("$thread_name").' '; -} + echo "
$paginator\n"; - -if ($allow_thread_sort == TRUE) { - if ($thread_sort_messages == 1 ) { + * This is the beginning of the message list table. + * It wraps around all messages + */ + echo '' ."\n" + . $moveFields + . html_tag( 'table' , + 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="1" cellspacing="0"' ) + , 'left', '', '' ) + , '', $color[0] ) + , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); + /* line between header and button area */ + echo '
'; + echo html_tag( 'tr' ) . "\n" + . html_tag( 'td' ,'' , 'left', '', '' ) + . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) + . '
' + . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) + . html_tag( 'tr', + getSmallStringCell(_("Move Selected To"), 'left', 'nowrap') . + 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 "
\n"; + do_hook('mailbox_form_before'); -echo " $msg_cnt_str\n" - . " \n" - . '' - . "\n" - . "\n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n". - " \n". - " \n". - "
\n" - . '  ' . _("Move Selected To:") . "\n" - . " \n" - . '  ' . _("Transform Selected Messages") . ":  
\n" - . "
\n" - . '   '. - ' '. - ' \n"."\n"; +} -echo " "; - if (!$auto_expunge) { - echo ' ' . _("mailbox") . ' '; - } - echo '' . - '' . - ' ' . - "
\n"; - do_hook('mailbox_form_before'); - echo ''. +function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { + if ($num_msgs) { + /* space between list and footer */ + echo ''; + + echo ''; + 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%" border="0" cellpadding="1" cellspacing="0"' ) + ) + ) + , '', $color[9], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ); + echo ''; + } + /* End of message-list table */ - "". - '\n"; +} + +function printHeader($mailbox, $sort, $color, $showsort=true) { + global $index_order; + echo html_tag( 'tr' ,'' , 'center', $color[5] ); + + /* calculate the width of the subject column based on the + * widths of the other columns */ + $widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5); + $subjectwidth = 100; + foreach($index_order as $item) { + $subjectwidth -= $widths[$item]; } - echo " BGCOLOR=\"$color[0]\">". - ""; - /* Print the headers. */ - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { + foreach ($index_order as $item) { + switch ($item) { case 1: /* checkbox */ case 5: /* flags */ - echo ' '; + echo html_tag( 'td' ,' ' , '', '', 'width="1%"' ); break; - case 2: /* from */ if (handleAsSent($mailbox)) { - echo ' \n"; + if ($showsort) { + ShowSortButton($sort, $mailbox, 2, 3); + } + echo "\n"; break; - case 3: /* date */ - echo ' \n"; + echo "\n"; break; - case 4: /* subject */ - echo ' \n"; + echo "\n"; break; - case 6: /* size */ - echo ' \n"; + echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); break; } } - echo "\n"; + 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'; @@ -659,11 +806,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 ' '; + echo ' sort'; } function get_selectall_link($start_msg, $sort) { @@ -672,26 +825,26 @@ function get_selectall_link($start_msg, $sort) { $result = ''; if ($javascript_on) { - $result = - '' . _("Toggle All") . "\n"; + $result = '' . _("Toggle All") + . "\n"; } else { if (strpos($PHP_SELF, "?")) { $result .= "%s to %s (%s total)"), $start_msg, $end_msg, $num_msgs); + $result = sprintf(_("Viewing Messages: %s to %s (%s total)"), + $start_msg, $end_msg, $num_msgs); } else if ($start_msg == $end_msg) { $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg); } else { $result = '
'; } - /* Return our result string. */ return ($result); } -/** +/* * Generate a paginator link. */ -function get_paginator_link -($box, $start_msg, $use, $text) { +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); +*/ } -/** +/* * This function computes the paginator string. */ -function get_paginator_str -($box, $start_msg, $end_msg, $num_msgs, $show_num, $sort) { +function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, + $show_num, $sort) { global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; /* Initialize paginator string chunks. */ $prv_str = ''; $nxt_str = ''; - $pg_str = ''; + $pg_str = ''; $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. */ @@ -807,30 +969,30 @@ function get_paginator_str $cur_pg = intval($start_msg / $show_num) + 1; /* Compute total # of pages and # of paginator page links. */ - $tot_pgs = ceil($num_msgs / $show_num); /* Total # of Pages */ + $tot_pgs = ceil($num_msgs / $show_num); /* Total number of Pages */ $vis_pgs = min($pg_max, $tot_pgs - 1); /* Visible Pages */ - /************************************************************/ /* Compute the size of the four quarters of the page links. */ - /************************************************************/ /* If we can, just show all the pages. */ if (($tot_pgs - 1) <= $pg_max) { $q1_pgs = $cur_pg - 1; $q2_pgs = $q3_pgs = 0; $q4_pgs = $tot_pgs - $cur_pg; - + /* Otherwise, compute some magic to choose the four quarters. */ } else { - /* Compute the magic base values. Added together, */ - /* these values will always equal to the $pag_pgs. */ - /* NOTE: These are DEFAULT values and do not take */ - /* the current page into account. That is below. */ + /* + * Compute the magic base values. Added together, + * these values will always equal to the $pag_pgs. + * NOTE: These are DEFAULT values and do not take + * the current page into account. That is below. + */ $q1_pgs = floor($vis_pgs/4); $q2_pgs = round($vis_pgs/4, 0); $q3_pgs = ceil($vis_pgs/4); $q4_pgs = round(($vis_pgs - $q2_pgs)/3, 0); - + /* Adjust if the first quarter contains the current page. */ if (($cur_pg - $q1_pgs) < 1) { $extra_pgs = ($q1_pgs - ($cur_pg - 1)) + $q2_pgs; @@ -865,14 +1027,14 @@ function get_paginator_str } } - /* I am leaving this debug code here, commented out, because */ - /* it is a really nice way to see what the above code is doing. */ - /* echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " */ - /* . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; */ + /* + * I am leaving this debug code here, commented out, because + * it is a really nice way to see what the above code is doing. + * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " + * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; + */ - /************************************************************/ /* Print out the page links from the compute page quarters. */ - /************************************************************/ /* Start with the first quarter. */ if (($q1_pgs == 0) && ($cur_pg > 1)) { @@ -915,14 +1077,14 @@ function get_paginator_str } } } else if ($PG_SHOWNUM == 999999) { - $pg_str = "" - . _("Paginate") . '' . $spc; + $pg_str = "" ._("Paginate") . '' . $spc; } /* If necessary, compute the 'show all' string. */ if (($prv_str != '') || ($nxt_str != '')) { - $all_str = "" . _("Show All") . ''; } @@ -931,12 +1093,16 @@ function get_paginator_str $tgl_str = get_selectall_link($start_msg, $sort); /* Put all the pieces of the paginator string together. */ + /** + * Hairy code... But let's leave it like it is since I am not certain + * a different approach would be any easier to read. ;) + */ $result = ''; $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : ''); - $result .= ($pg_str != '' ? $pg_str : ''); + $result .= ($pg_str != '' ? $pg_str : ''); $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : ''); - $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); + $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); /* If the resulting string is blank, return a non-breaking space. */ if ($result == '') { @@ -947,48 +1113,94 @@ function get_paginator_str return ($result); } -function processSubject($subject) { - // Shouldn't ever happen -- caught too many times in the IMAP functions +function processSubject($subject, $threadlevel = 0) { + global $languages, $squirrelmail_language; + /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') return _("(no subject)"); - if (strlen($subject) <= 55) + $trim_at = 55; + + /* if this is threaded, substract two chars per indentlevel */ + if($threadlevel > 0 && $threadlevel <= 10) + $trim_at -= (2*$threadlevel); + + if (strlen($subject) <= $trim_at) return $subject; - $ent_strlen=strlen($subject); - $trim_val=50; - $ent_offset=0; - // see if this is entities-encoded string - // If so, Iterate through the whole string, find out - // the real number of characters, and if more - // than 55, substr with an updated trim value. - while (($ent_loc = strpos($subject, '&', $ent_offset)) !== false && - ($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) - { - $trim_val += ($ent_loc_end-$ent_loc)+1; - $ent_strlen -= $ent_loc_end-$ent_loc; - $ent_offset = $ent_loc_end+1; - } - - if ($ent_strlen <= 55) + $ent_strlen = strlen($subject); + $trim_val = $trim_at - 5; + $ent_offset = 0; + /* + * see if this is entities-encoded string + * If so, Iterate through the whole string, find out + * the real number of characters, and if more + * than 55, substr with an updated trim value. + */ + while ( (($ent_loc = strpos($subject, '&', $ent_offset)) !== false) && + (($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) ) { + $trim_val += ($ent_loc_end-$ent_loc)+1; + $ent_strlen -= $ent_loc_end-$ent_loc; + $ent_offset = $ent_loc_end+1; + } + + if ($ent_strlen <= $trim_at){ 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; global $handleAsSent_result; - + /* First check if this is the sent or draft folder. */ - $handleAsSent_result = (($mailbox == $sent_folder) - || ($mailbox == $draft_folder)); + $handleAsSent_result = isSentMailbox($mailbox) || isDraftMailbox($mailbox); /* Then check the result of the handleAsSent hook. */ do_hook('check_handleAsSent_result', $mailbox); /* And return the result. */ - return ($handleAsSent_result); + return $handleAsSent_result; } - ?>
 '. _("To") .''; + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("To") . ''; } else { - echo ' '. _("From") .''; + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("From") . ''; } - if ($thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 2, 3); - } - echo "'. _("Date") .''; - if ($thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 0, 1); + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + . '' . _("Date") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, 0, 1); } - echo "'. _("Subject") .' '; - if ($thread_sort_messages != 1) { + echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' ) + . '' . _("Subject") . ''; + if ($showsort) { ShowSortButton($sort, $mailbox, 4, 5); } - echo "' . _("Size")."