X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=74cdc82ccade18b8187b4de9290a34b37a83f370;hp=0ef018fc0e6105749f25d8aa219d75decf1bfb50;hb=5786ef5a2acd7a4de7b84aa0bd8c6e6d58b6da6b;hpb=6fbd125bd6a9b93f4426ded8ec23b4d6986c81bf diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 0ef018fc..74cdc82c 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,15 +12,15 @@ * $Id$ */ -require_once('../functions/strings.php'); -require_once('../functions/html.php'); -require_once('../class/html.class.php'); -require_once('../functions/imap_mailbox.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, +function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $start_msg, $where, $what) { global $checkall, $color, $msgs, $msort, @@ -49,10 +49,10 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, } $msg = $msgs[$key]; - if( $mailbox == 'None' ) { - $boxes = sqimap_mailbox_list($imapConnection); + if($mailbox == 'None') { + $boxes = sqimap_mailbox_list($imapConnection); $mailbox = $boxes[0]['unformatted']; - unset( $boxes ); + unset($boxes); } $urlMailbox = urlencode($mailbox); @@ -63,7 +63,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, * because you can have multiple receivers. */ $senderNames = explode(',', $msg['FROM']); - $senderName = ''; + $senderName = ''; if (sizeof($senderNames)){ foreach ($senderNames as $senderNames_part) { if ($senderName != '') { @@ -73,12 +73,12 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, } } } else { - $senderName = sqimap_find_displayable_name($msg['FROM']); + $senderName = sqimap_find_displayable_name($msg['FROM']); } $subject = processSubject($msg['SUBJECT']); - echo html_tag( 'tr' ) . "\n"; + echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { $flag = ""; @@ -113,7 +113,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $searchstr = '&where='.$where.'&what='.$what; } else { $searchstr = ''; - } + } /** * AAAAH! Make my eyes stop bleeding! * Who wrote this?! @@ -121,19 +121,19 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, 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; } } } @@ -142,33 +142,31 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, if (!isset($hlt_color)) { $hlt_color = $color_string; } - - $checked = ($checkall == 1) ? ' checked' : ''; - $row = new html(); - $row->tag = 'tr'; - $row->class = 'm_r'; - $row->id = 'mr'.$t; - - - 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 */ + $date_string = $msg['DATE_STRING'] . ''; + if ($date_string == '') { + $date_string = _("Unknown date"); + } echo html_tag( 'td', - $bold . $flag . $fontstr . $msg['DATE_STRING'] . + $bold . $flag . $fontstr . $date_string . $fontstr_end . $flag_end . $bold_end, 'center', $hlt_color, @@ -182,8 +180,8 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, } } $td_str .= '\n"; + if ($not_last) { + echo '' . "\n" . '' . "\n"; + } else { + echo ''."\n"; + } +} + +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)); + + $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 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 { - return false; - } + $id = get_thread_sort($imapConnection); + return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); } -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 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, +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 = 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); } - $msgs = fillMessageArray($imapConnection,$id,$end_loop); - } - return $msgs; + return $msgs; } @@ -336,131 +324,125 @@ function getSelfSortMessages($imapConnection, $start_msg, $show_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']; - } +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 ($mbxresponse['EXISTS'] > 0) { + /* if $start_msg is lower than $num_msgs, we probably deleted all messages + * in the last page. We need to re-adjust the start_msg + */ - if($start_msg > $num_msgs) { - $start_msg -= $show_num; - if($start_msg < 1) { - $start_msg = 1; - } - } - - /* This code and the next if() block check for - * server-side sorting methods. The $id array is - * formatted and $sort is set to 6 to disable - * SM internal sorting - */ - - if ($thread_sort_messages == 1) { - $mode = 'thread'; - } elseif ($allow_server_sort == 1) { - $mode = 'serversort'; - } else { - $mode = ''; - } - - switch ($mode) { - case 'thread': - session_unregister('msort'); - session_unregister('msgs'); - $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, - $num_msgs); - if ($msgs === false) { - echo '
' . - _("Thread sorting is not supported by your IMAP server.
Please report this to the system administrator."). - '
'; - $thread_sort_messages = 0; - $msort = $msgs = array(); - session_register('msort'); - session_register('msgs'); - } else { - $msort= $msgs; - $sort = 6; - session_register('msort'); - session_register('msgs'); + if($start_msg > $num_msgs) { + $start_msg -= $show_num; + if($start_msg < 1) { + $start_msg = 1; } - - break; - case 'serversort': - $msgs = getServerSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse); - if ($msgs === false) { - echo '
' . - _( "Server-side sorting is not supported by your IMAP server.
Please report this to the system administrator."). - '
'; - $sort = $server_sort_order; - $allow_server_sort = FALSE; - $msort = $msgs = array(); - session_register('msort'); - session_register('msgs'); - $id = array(); - } else { - $sort = 6; - $msort = $msgs; - session_register('msort'); - session_register('msgs'); - } - break; - default: - if (!$use_cache) { - session_unregister('msgs'); - session_unregister('msort'); - $msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse); - $msort = calc_msort($msgs, $sort); - session_register('msort'); - session_register('msgs'); - } /* !use cache */ - break; - } // switch - } /* if exists > 0 */ - - $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); + } + + /* 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 = ''; + } + + 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]; - - echo '
'; - printHeader($mailbox, $srt, $color, !$thread_sort_messages); + $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg, + $num_msgs, $show_num, $sort); - displayMessageArray($imapConnection, $num_msgs, $start_msg, + $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 '
'; - - /** - * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. - */ + mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); + echo '
'; } function calc_msort($msgs, $sort) { @@ -473,136 +455,131 @@ function calc_msort($msgs, $sort) { * 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; -} - -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; - } - } - - $j = 0; - while ($j < $count) { - - 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]; - } - $j++; - } - return $messages; + 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; +} + +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; + } + } + + 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; } /* 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; - - $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 ) { - $indent_array = get_parent_level($imapConnection); - } +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; + + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; + $urlMailbox = urlencode($mailbox); - $real_startMessage = $start_msg; - if ($sort == 6) { - if ($end_msg - $start_msg < $show_num - 1) { - $end_msg = $end_msg - $start_msg + 1; - $start_msg = 1; - } else if ($start_msg > $show_num) { - $end_msg = $show_num; - $start_msg = 1; + /* get indent level for subject display */ + if ($thread_sort_messages == 1 ) { + $indent_array = get_parent_level($imapConnection); } - } - $endVar = $end_msg + 1; - - /* - * Loop through and display the info for each message. - * ($t is used for the checkbox number) - */ - $t = 0; - - /* messages display */ - - if ($num_msgs == 0) { + + $real_startMessage = $start_msg; + if ($sort == 6) { + if ($end_msg - $start_msg < $show_num - 1) { + $end_msg = $end_msg - $start_msg + 1; + $start_msg = 1; + } else if ($start_msg > $show_num) { + $end_msg = $show_num; + $start_msg = 1; + } + } + $endVar = $end_msg + 1; + + /* + * 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 */ echo html_tag( 'tr', html_tag( 'td', @@ -611,42 +588,43 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, $color[4], 'COLSPAN="' . count($index_order) . '"' ) - ); - } elseif ($start_msg == $end_msg) { + ); + } elseif ($start_msg == $end_msg) { /* if there's only one message in the box, handle it differently. */ - if ($sort != 6){ - $i = $start_msg; + if ($sort != 6) { + $i = $start_msg; + } else { + $i = 1; + } + reset($msort); + $k = 0; + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + printMessageInfo($imapConnection, $t, true, $key, $mailbox, + $real_startMessage, $where, $what); } else { - $i = 1; + $i = $start_msg; + reset($msort); + $k = 0; + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + $not_last = true; + do { + 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); } - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, - $real_startMessage, $where, $what); - } else { - $i = $start_msg; - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, - $real_startMessage, $where, $what); - $key = key($msort); - $t++; - $i++; - next($msort); - } while ($i && $i < $endVar); - } - echo ''; } /* @@ -659,37 +637,40 @@ 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, - $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; - - $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"; +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); - /* - * This is the beginning of the message list table. - * It wraps around all messages - */ + 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" - . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . + . html_tag( 'table' , html_tag( 'tr', html_tag( 'td' , html_tag( 'table' , @@ -697,14 +678,21 @@ function mail_message_listing_beginning ($imapConnection, html_tag( 'td', $paginator, 'left' ) . html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'border="0" width="100%" cellpadding="2" cellspacing="0"' ) + , '', $color[4], 'border="0" width="100%" cellpadding="1" 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"' ) + , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); + /* line between header and button area */ + echo ''; + + 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') . + getSmallStringCell(_("Move Selected To"), 'left', 'nowrap') . getSmallStringCell(_("Transform Selected Messages"), 'right') ) . html_tag( 'tr' ) ."\n" @@ -714,35 +702,36 @@ function mail_message_listing_beginning ($imapConnection, echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; echo " \n" - . html_tag( 'td', '', 'right', '', 'nowrap' ); + . 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) { - $set_thread = 1; - $thread_name = _("Thread View"); + + 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) { + $set_thread = 1; + $thread_name = _("Thread View"); + } echo html_tag( 'tr' , html_tag( 'td' , '  ' , '', '', '' ) , '', '', '' ); - } - - echo "\n"; + } - echo "\n"; + echo "\n"; do_hook('mailbox_form_before'); - echo '' - . html_tag( 'tr' ) - . html_tag( 'td' ,'' , '', $color[0], '' ); - if ($GLOBALS['alt_index_colors']){ - $cellspacing = '0'; - } else { - $cellspacing = '1'; - } - echo html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="2" cellspacing="'. $cellspacing .'"' ); - /* 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; } @@ -781,6 +758,10 @@ function mail_message_listing_beginning ($imapConnection, 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', @@ -789,24 +770,22 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo html_tag( 'td', $paginator_str ) . html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' ) + , '', $color[4], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) ) - , '', $color[4] ) - , '', $color[9], 'width="100%" cellpadding="1" cellspacing="1"' ); - + ) + , '', $color[9], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ); + echo ''; } - /* End of message-list table */ - - do_hook('mailbox_index_after'); - 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"' ); + global $index_order; echo html_tag( 'tr' ,'' , 'center', $color[5] ); - for ($i=1; $i <= count($index_order); $i++) { + for ($i = 1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: /* checkbox */ case 5: /* flags */ @@ -815,10 +794,10 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { case 2: /* from */ if (handleAsSent($mailbox)) { echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("To") . ''; + . '' . _("To") . ''; } else { echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("From") . ''; + . '' . _("From") . ''; } if ($showsort) { ShowSortButton($sort, $mailbox, 2, 3); @@ -827,7 +806,7 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { break; case 3: /* date */ echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) - . '' . _("Date") . ''; + . '' . _("Date") . ''; if ($showsort) { ShowSortButton($sort, $mailbox, 0, 1); } @@ -835,7 +814,7 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { break; case 4: /* subject */ echo html_tag( 'td' ,'' , 'left', '', '' ) - . '' . _("Subject") . ''; + . '' . _("Subject") . ''; if ($showsort) { ShowSortButton($sort, $mailbox, 4, 5); } @@ -854,427 +833,423 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { * 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'; - $which = $Up; - } elseif ($sort == $Up) { - $img = 'up_pointer.png'; - $which = $Down; - } else { - $img = 'down_pointer.png'; - $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'; -} - -function get_selectall_link($start_msg, $sort) { - global $checkall, $what, $where, $mailbox, $javascript_on; - global $PHP_SELF, $PG_SHOWNUM; - - $result = ''; - if ($javascript_on) { - $result = - '' . _("Toggle All") - . "\n"; - } else { - if (strpos($PHP_SELF, "?")) { - $result .= "sort'; +} + +function get_selectall_link($start_msg, $sort) { + global $checkall, $what, $where, $mailbox, $javascript_on; + global $PHP_SELF, $PG_SHOWNUM; + + $result = ''; + if ($javascript_on) { + $result = '' . _("Toggle All") + . "\n"; } else { - $result .= _("Select All"); + if (strpos($PHP_SELF, "?")) { + $result .= "%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); + /* Compute the $msg_cnt_str. */ + $result = ''; + if ($start_msg < $end_msg) { + $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) { - global $PHP_SELF; + global $PHP_SELF; - $result = "$text"; - return ($result); + $result = "$text"; + return ($result); /* - if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { - $source_url = $regs[1]; - } else { - $source_url = $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) { - global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; - - /* Initialize paginator string chunks. */ - $prv_str = ''; - $nxt_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. */ - - /* Get some paginator preference values. */ - $pg_sel = getPref($data_dir, $username, 'page_selector', SMPREF_ON); - $pg_max = getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX); - - /* Make sure that our start message number is not too big. */ - $start_msg = min($start_msg, $num_msgs); - - /* Decide whether or not we will use the mailbox cache. */ - /* Not sure why $use_mailbox_cache is even passed in. */ - if ($sort == 6) { - $use = 0; - } else { - $use = 1; - } - - /* Compute the starting message of the previous and next page group. */ - $next_grp = $start_msg + $show_num; - $prev_grp = $start_msg - $show_num; - - /* Compute the basic previous and next strings. */ - if (($next_grp <= $num_msgs) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); - $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); - } else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); - $nxt_str = ""._("Next")."\n"; - } else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) { - $prv_str = ""._("Previous") . ''; - $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); - } - - /* Page selector block. Following code computes page links. */ - if ($pg_sel && ($num_msgs > $show_num)) { - /* Most importantly, what is the current page!!! */ - $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 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; - +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 = ''; + $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. */ + + /* Get some paginator preference values. */ + $pg_sel = getPref($data_dir, $username, 'page_selector', SMPREF_ON); + $pg_max = getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX); + + /* Make sure that our start message number is not too big. */ + $start_msg = min($start_msg, $num_msgs); + + /* Decide whether or not we will use the mailbox cache. */ + /* Not sure why $use_mailbox_cache is even passed in. */ + if ($sort == 6) { + $use = 0; + } else { + $use = 1; + } + + /* Compute the starting message of the previous and next page group. */ + $next_grp = $start_msg + $show_num; + $prev_grp = $start_msg - $show_num; + + /* Compute the basic previous and next strings. */ + if (($next_grp <= $num_msgs) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); + $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); + } else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); + $nxt_str = ""._("Next")."\n"; + } else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) { + $prv_str = ""._("Previous") . ''; + $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); + } + + /* Page selector block. Following code computes page links. */ + if ($pg_sel && ($num_msgs > $show_num)) { + /* Most importantly, what is the current page!!! */ + $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 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. - */ - $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; - $q1_pgs = $cur_pg - 1; - $q2_pgs = 0; - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* 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); - $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75); - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* 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; - $q4_pgs = $tot_pgs - $cur_pg; - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - - /* 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); - $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - } - } - - /* - * 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)) { - $pg_str .= "...$spc"; - } else { - for ($pg = 1; $pg <= $q1_pgs; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - if ($cur_pg - $q2_pgs - $q1_pgs > 1) { - $pg_str .= "...$spc"; - } - } - - /* Continue with the second quarter. */ - for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - - /* Now print the current page. */ - $pg_str .= $cur_pg . $spc; - - /* Next comes the third quarter. */ - for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - - /* And last, print the forth quarter page links. */ - if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) { - $pg_str .= "...$spc"; - } else { - if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) { - $pg_str .= "...$spc"; - } - for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - } - } else if ($PG_SHOWNUM == 999999) { - $pg_str = "" ._("Paginate") . '' . $spc; - } + } 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. + */ + $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; + $q1_pgs = $cur_pg - 1; + $q2_pgs = 0; + $q3_pgs += ceil($extra_pgs / 2); + $q4_pgs += floor($extra_pgs / 2); + + /* 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); + $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75); + $q3_pgs += ceil($extra_pgs / 2); + $q4_pgs += floor($extra_pgs / 2); + + /* 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; + $q4_pgs = $tot_pgs - $cur_pg; + $q1_pgs += floor($extra_pgs / 2); + $q2_pgs += ceil($extra_pgs / 2); + + /* 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); + $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); + $q1_pgs += floor($extra_pgs / 2); + $q2_pgs += ceil($extra_pgs / 2); + } + } - /* If necessary, compute the 'show all' string. */ - if (($prv_str != '') || ($nxt_str != '')) { - $all_str = "" . _("Show All") . ''; - } - - /* Last but not least, get the value for the toggle all link. */ - $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 .= ($all_str != '' ? $sep . $spc . $all_str . $spc : ''); - $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); - - /* If the resulting string is blank, return a non-breaking space. */ - if ($result == '') { - $result = ' '; - } + /* + * 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)) { + $pg_str .= "...$spc"; + } else { + for ($pg = 1; $pg <= $q1_pgs; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + if ($cur_pg - $q2_pgs - $q1_pgs > 1) { + $pg_str .= "...$spc"; + } + } - /* Return our final magical paginator string. */ - return ($result); + /* Continue with the second quarter. */ + for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + + /* Now print the current page. */ + $pg_str .= $cur_pg . $spc; + + /* Next comes the third quarter. */ + for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + + /* And last, print the forth quarter page links. */ + if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) { + $pg_str .= "...$spc"; + } else { + if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) { + $pg_str .= "...$spc"; + } + for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + } + } else if ($PG_SHOWNUM == 999999) { + $pg_str = "" ._("Paginate") . '' . $spc; + } + + /* If necessary, compute the 'show all' string. */ + if (($prv_str != '') || ($nxt_str != '')) { + $all_str = "" . _("Show All") . ''; + } + + /* Last but not least, get the value for the toggle all link. */ + $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 .= ($all_str != '' ? $sep . $spc . $all_str . $spc : ''); + $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); + + /* If the resulting string is blank, return a non-breaking space. */ + if ($result == '') { + $result = ' '; + } + + /* Return our final magical paginator string. */ + return ($result); } function processSubject($subject) { 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) - 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; - } + /* Shouldn't ever happen -- caught too many times in the IMAP functions */ + if ($subject == '') + return _("(no subject)"); - if ($ent_strlen <= 55){ - return $subject; - } - - if (function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val); - } - - return substr($subject, 0, $trim_val) . '...'; + if (strlen($subject) <= 55) + 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){ + 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 '  '; + $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 '  '; + echo '  '; } function getButton($type, $name, $value) { -return ''; + return ''; } function getSmallStringCell($string, $align) { - return html_tag( 'td', - '' . $string . ':  ', - $align, - '', - 'nowrap' ); + 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 ($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; + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { + $start_msg = 1; + } } - } - return (array($start_msg,$end_msg)); + return (array($start_msg,$end_msg)); } function handleAsSent($mailbox) { - global $sent_folder, $draft_folder, $handleAsSent_result; + 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)); - - /* Then check the result of the handleAsSent hook. */ - do_hook('check_handleAsSent_result', $mailbox); + /* First check if this is the sent or draft folder. */ + $handleAsSent_result = (($mailbox == $sent_folder) + || ($mailbox == $draft_folder)); - /* And return the result. */ - return ($handleAsSent_result); -} + /* Then check the result of the handleAsSent hook. */ + do_hook('check_handleAsSent_result', $mailbox); + /* And return the result. */ + return ($handleAsSent_result); +} ?>