X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=08909f478983760f322713d8761743ab0c08afeb;hb=4b920601138434546a98d0e3b2150fbc0a8c13b0;hp=0f7e74f736e0a5fa322eed879d4b30784d5da685;hpb=8008456a180e245d1c81c1773547d59573b5c1bf;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 0f7e74f7..08909f47 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,27 +12,27 @@ * $Id$ */ -require_once('../functions/strings.php'); -require_once('../functions/imap_utf7_decode_local.php'); -require_once('../functions/html.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){ +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 */ - $server_sort_order, /* sort value when using server-sorting */ - $row_count, - $allow_server_sort; /* enable/disable server-side sorting */ + $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']) { @@ -49,29 +49,36 @@ $start_msg, $where, $what){ } $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($mailbox == 'None') { + $boxes = sqimap_mailbox_list($imapConnection); + $mailbox = $boxes[0]['unformatted']; + unset($boxes); + } + $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"; + + echo html_tag( 'tr' ) . "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { $flag = ""; @@ -102,6 +109,11 @@ $start_msg, $where, $what){ $fontstr_end = ''; } + if ($where && $what) { + $searchstr = '&where='.$where.'&what='.$what; + } else { + $searchstr = ''; + } /** * AAAAH! Make my eyes stop bleeding! * Who wrote this?! @@ -109,19 +121,19 @@ $start_msg, $where, $what){ 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']))) { + $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; } - } 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; } } } @@ -130,33 +142,22 @@ $start_msg, $where, $what){ 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); - } else { - $search_stuff = ''; - } - - $checked = ($checkall == 1) ? ' checked' : ''; - - if (sizeof($index_order)){ + $checked = ($checkall == 1) ? true : false; + $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', + 'center', $hlt_color ); break; case 2: /* from */ echo html_tag( 'td', - $italic . $bold . $flag . $fontstr . $senderName . + $italic . $bold . $flag . $fontstr . $senderName . $fontstr_end . $flag_end . $bold_end . $italic_end, - '', + 'left', $hlt_color ); break; case 3: /* date */ @@ -174,9 +175,9 @@ $start_msg, $where, $what){ $td_str .= str_repeat("    ",$indent_array[$msg['ID']]); } } - $td_str .= "\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, $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 - */ - - if($start_msg > $num_msgs) { - $start_msg -= $show_num; - if($start_msg < 1) { - $start_msg = 1; +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 { + $end_msg = $num_msgs; } - } + $id = array_slice($id, ($start_msg-1), ($end_msg)); - /* 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)); + $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 ($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 getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { + $id = get_thread_sort($imapConnection); + return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); +} - /* If autoexpunge is turned on, then do it now. */ - 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 && $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; - } - } +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); +} - $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 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); - 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; - $flag_deleted[] = $hdr->flag_deleted; - $flag_answered[] = $hdr->flag_answered; - $flag_seen[] = $hdr->flag_seen; - $flag_flagged[] = $hdr->flag_flagged; + 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; @@ -373,199 +308,253 @@ $use_cache) { } 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]; - $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: - * vedr|sv (Danish) - * re|aw (English) - * - * TODO: i18n should be incorporated here. E.g. we catch the ones - * 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", - $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++; +/* + * 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']; + } - /* - * 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]; + 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 + */ - $i++; - $j++; - } - $num_msgs = $i; - } else { - if (!isset($messages)) { - $messages = array(); + if($start_msg > $num_msgs) { + $start_msg -= $show_num; + if($start_msg < 1) { + $start_msg = 1; } - $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'); + /* 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 { - $msort = $msgs; + $mode = ''; } - 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'); - } - 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'); + 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); + + $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, - $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'); +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 (!session_is_registered('msort')) { - session_register('msort'); + if ($sort < 6) { + if ($sort % 2) { + asort($msort); + } else { + arsort($msort); + } } + return $msort; +} - if ($start_msg + ($show_num - 1) < $num_msgs){ - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; +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; + } } - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 1; + for($j = 0; $j < $count; ++$j) { + 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'] = $unique_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]; + $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: + * vedr|sv (Danish) + * re|aw (English) + * + * TODO: i18n should be incorporated here. E.g. we catch the ones + * 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", + $messages[$j]['SUBJECT-SORT'], $matches)){ + $messages[$j]['SUBJECT-SORT'] = $matches[2]; } } + return $messages; +} - $urlMailbox = urlencode($mailbox); - do_hook('mailbox_index_before'); +/* 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, $checkall, + $indent_array, $thread_sort_messages, $allow_server_sort, + $server_sort_order, $PHP_SELF; - $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); + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; - if (!isset($msg)) { - $msg = ''; - } + $urlMailbox = urlencode($mailbox); /* 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) { @@ -579,26 +568,26 @@ $show_num) { $endVar = $end_msg + 1; /* - * Loop through and display the info for each message. - * ($t is used for the checkbox number) - */ + * Loop through and display the info for each message. + * ($t is used for the checkbox number) + */ $t = 0; + + /* messages display */ + if ($num_msgs == 0) { - /* if there's no messages in this folder */ + /* 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) . '"' - ) + 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){ + /* if there's only one message in the box, handle it differently. */ + if ($sort != 6) { $i = $start_msg; } else { $i = 1; @@ -610,8 +599,8 @@ $show_num) { 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); @@ -621,211 +610,226 @@ $show_num) { 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 ''; - - 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"' ); - - /* 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 ""; -* -* $moveURL is the URL to submit the delete/move form to -* $mailbox is the current mailbox -* $sort is the current sorting method (-1 for no sorting available [searches]) -* $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, - $checkall, $sent_folder, $draft_folder, $thread_sort_messages, - $allow_thread_sort, $allow_server_sort, $server_sort_order, - $lastTargetMailbox; + * Displays the standard message list header. To finish the table, + * you need to do a ""; + * + * $moveURL is the URL to submit the delete/move form to + * $mailbox is the current mailbox + * $sort is the current sorting method (-1 for no sorting available [searches]) + * $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, + $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 = ''; + } + $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 - */ + * This is the beginning of the message list table. + * It wraps around all messages + */ echo "
\n" - . "\n' - . "
" - . " \n" - . html_tag( 'td', $paginator, 'left' ) - . html_tag( 'td', $msg_cnt_str, 'right' ) - . "
\n" - . '
\n" - . "\n" - . " \n" - . html_tag( 'td', - ' ' . _("Move Selected To:") . '', - 'left', - '', - 'valign="middle" nowrap' ) - . html_tag( 'td', - '' . _("Transform Selected Messages") . ':  
', - 'right', - '', - 'nowrap' ) - . " \n" - . " \n" - . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' ) - . '  '; + + echo '\n" + . html_tag( 'td', '', 'right', '', 'nowrap' ); + - $boxes = sqimap_mailbox_list($imapConnection); - foreach ($boxes as $boxes_part) { - if (!in_array('noselect', $boxes_part['flags'])) { - $box = $boxes_part['unformatted']; - $box2 = str_replace(' ', ' ', imap_utf7_decode_local($boxes_part['unformatted-disp'])); - if( $box2 == 'INBOX' ) { - $box2 = _("INBOX"); - } - if ($lastTargetMailbox == $box) { - echo " \n"; - } - else { - echo " \n"; - } - } - } - echo '  ' - . ' ' - . ' \n" . "\n"; - echo " \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"); - } - elseif ($thread_sort_messages == 0) { + } elseif ($thread_sort_messages == 0) { $set_thread = 1; $thread_name = _("Thread View"); } - echo ''; + echo html_tag( 'tr' , + html_tag( 'td' , + ' ' . $thread_name + . ' ' + , '', '', '' ) + , '', '', '' ); } - 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 " "; if (!$auto_expunge) { - echo ' ' . _("mailbox") . ' '; + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) + .' ' . _("mailbox") . "\n"; } - echo '' - . '' - . ' ' - . "
 ' . $thread_name - . ' 
\n"; + echo "
\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 - */ + * 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++) { +} + +function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { + if ($num_msgs) { + /* space between list and footer */ + echo ''; + } + /* 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( 'tr' ,'' , 'center', $color[5] ); + for ($i = 1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: /* checkbox */ case 5: /* flags */ - echo ' '; + echo html_tag( 'td' ,' ' , '', '', 'width="1%"' ); break; case 2: /* from */ if (handleAsSent($mailbox)) { - echo ' \n"; + echo "\n"; break; case 3: /* date */ - echo ' \n"; + echo "\n"; break; - case 4: /* subject */ - echo ' \n"; + echo "\n"; break; case 6: /* size */ echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); break; } } - /* if using server-sorting, - * send sort back to 6 - */ - if ($allow_server_sort == TRUE) { - $sort = 6; - } - echo "\n"; + echo "\n"; } + /* -* This function shows the sort button. Isn't this a good comment? -*/ -function ShowSortButton($sort, $mailbox, $Up, $Down) { + * This function shows the sort button. Isn't this a good comment? + */ +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'; @@ -838,11 +842,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 ' sort'; + echo ' sort'; } function get_selectall_link($start_msg, $sort) { @@ -851,27 +861,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); + $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. -*/ + * Generate a paginator link. + */ function get_paginator_link($box, $start_msg, $use, $text) { + global $PHP_SELF; + $result = "$text"; + . "&startMessage=$start_msg&mailbox=$box\" " + . "TARGET=\"right\">$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. -*/ + * This function computes the paginator string. + */ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, -$show_num, $sort) { + $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. */ @@ -994,14 +1016,14 @@ $show_num, $sort) { $q2_pgs = $q3_pgs = 0; $q4_pgs = $tot_pgs - $cur_pg; - /* Otherwise, compute some magic to choose the four quarters. */ + /* 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); @@ -1015,7 +1037,7 @@ $show_num, $sort) { $q3_pgs += ceil($extra_pgs / 2); $q4_pgs += floor($extra_pgs / 2); - /* Adjust if the first and second quarters intersect. */ + /* Adjust if the first and second quarters intersect. */ } else if (($cur_pg - $q2_pgs - ceil($q2_pgs/3)) <= $q1_pgs) { $extra_pgs = $q2_pgs; $extra_pgs -= ceil(($cur_pg - $q1_pgs - 1) * 0.75); @@ -1023,7 +1045,7 @@ $show_num, $sort) { $q3_pgs += ceil($extra_pgs / 2); $q4_pgs += floor($extra_pgs / 2); - /* Adjust if the fourth quarter contains the current page. */ + /* Adjust if the fourth quarter contains the current page. */ } else if (($cur_pg + $q4_pgs) >= $tot_pgs) { $extra_pgs = ($q4_pgs - ($tot_pgs - $cur_pg)) + $q3_pgs; $q3_pgs = 0; @@ -1031,7 +1053,7 @@ $show_num, $sort) { $q1_pgs += floor($extra_pgs / 2); $q2_pgs += ceil($extra_pgs / 2); - /* Adjust if the third and fourth quarter intersect. */ + /* Adjust if the third and fourth quarter intersect. */ } else if (($cur_pg + $q3_pgs + 1) >= ($tot_pgs - $q4_pgs + 1)) { $extra_pgs = $q3_pgs; $extra_pgs -= ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); @@ -1042,11 +1064,11 @@ $show_num, $sort) { } /* - * 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. */ @@ -1092,15 +1114,15 @@ $show_num, $sort) { } } else if ($PG_SHOWNUM == 999999) { $pg_str = "" ._("Paginate") . '' . $spc; + . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" " + . "TARGET=\"right\">" ._("Paginate") . '' . $spc; } /* If necessary, compute the 'show all' string. */ if (($prv_str != '') || ($nxt_str != '')) { $all_str = "" . _("Show All") . ''; + . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" " + . "TARGET=\"right\">" . _("Show All") . ''; } /* Last but not least, get the value for the toggle all link. */ @@ -1108,15 +1130,15 @@ $show_num, $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. ;) - */ + * 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 == '') { @@ -1128,42 +1150,97 @@ $show_num, $sort) { } function processSubject($subject) { + global $languages, $squirrelmail_language; /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') - return _("(no subject)"); + return _("(no subject)"); if (strlen($subject) <= 55) - return $subject; + return $subject; - $ent_strlen=strlen($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. - */ + * 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_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; + $ent_offset = $ent_loc_end+1; } if ($ent_strlen <= 55){ 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; /* First check if this is the sent or draft folder. */ $handleAsSent_result = (($mailbox == $sent_folder) - || ($mailbox == $draft_folder)); + || ($mailbox == $draft_folder)); /* Then check the result of the handleAsSent hook. */ do_hook('check_handleAsSent_result', $mailbox); @@ -1171,5 +1248,4 @@ function handleAsSent($mailbox) { /* And return the result. */ return ($handleAsSent_result); } - -?> \ No newline at end of file +?>
'; + + 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 '
' . _("To") . ''; + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("To") . ''; } else { - echo ' ' . _("From") . ''; + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("From") . ''; } - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + if ($showsort) { ShowSortButton($sort, $mailbox, 2, 3); } - echo "' . _("Date") . ''; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + . '' . _("Date") . ''; + if ($showsort) { ShowSortButton($sort, $mailbox, 0, 1); } - echo "' . _("Subject") . ' '; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + case 4: /* subject */ + echo html_tag( 'td' ,'' , 'left', '', '' ) + . '' . _("Subject") . ''; + if ($showsort) { ShowSortButton($sort, $mailbox, 4, 5); } - echo "