X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=efce2944c4773bddd1000a677778ad4a1807467b;hb=bea3eb1eaaef517e7030097b8a8061363341be61;hp=5caf500bc9bbff470ac8589228875c1893084940;hpb=c0d04f9753371080831e9e79f41d7b4756df83ab;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 5caf500b..efce2944 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -3,7 +3,7 @@ /** * mailbox_display.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains functions that display mailbox information, such as the @@ -20,10 +20,24 @@ 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 elapsed($start) +{ + $end = microtime(); + list($start2, $start1) = explode(" ", $start); + list($end2, $end1) = explode(" ", $end); + $diff1 = $end1 - $start1; + $diff2 = $end2 - $start2; + if( $diff2 < 0 ){ + $diff1 -= 1; + $diff2 += 1.0; + } + return $diff2 + $diff1; +} + +function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $start_msg, $where, $what) { global $checkall, - $color, $msgs, $msort, + $color, $msgs, $msort, $td_str, $msg, $default_use_priority, $message_highlight_list, $index_order, @@ -58,27 +72,33 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, if (handleAsSent($mailbox)) { $msg['FROM'] = $msg['TO']; + } + $msg['FROM'] = parseAddress($msg['FROM'],1); + /* * 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) { + + $senderNames = $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 ($senderNames_part[1]) { + $senderName .= decodeHeader($senderNames_part[1]); + } else { + $senderName .= htmlspecialchars($senderNames_part[0]); + } + } } - $subject = processSubject($msg['SUBJECT']); - - echo html_tag( 'tr' ) . "\n"; + $msg['SUBJECT'] = decodeHeader($msg['SUBJECT']); + $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]); + + echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { $flag = ""; @@ -114,25 +134,40 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, } else { $searchstr = ''; } - /** - * AAAAH! Make my eyes stop bleeding! - * Who wrote this?! - */ - if (sizeof($message_highlight_list)){ + + if (is_array($message_highlight_list) && count($message_highlight_list)) { + $msg['TO'] = parseAddress($msg['TO']); + $msg['CC'] = parseAddress($msg['CC']); foreach ($message_highlight_list as $message_highlight_list_part) { if (trim($message_highlight_list_part['value']) != '') { $high_val = strtolower($message_highlight_list_part['value']); $match_type = strtoupper($message_highlight_list_part['match_type']); - if ($match_type == 'TO_CC') { - if (strstr('^^' . strtolower($msg['TO']), $high_val) || - strstr('^^' . strtolower($msg['CC']), $high_val)) { - $hlt_color = $message_highlight_list_part['color']; - continue; - } + if($match_type == 'TO_CC') { + $match = array('TO', 'CC'); } else { - if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) { - $hlt_color = $message_highlight_list_part['color']; - continue; + $match = array($match_type); + } + foreach($match as $match_type) { + switch($match_type) { + case('TO'): + case('CC'): + case('FROM'): + foreach ($msg[$match_type] as $address) { + $address[0] = decodeHeader($address[0]); + $address[1] = decodeHeader($address[1]); + if (strstr('^^' . strtolower($address[0]), $high_val) || + strstr('^^' . strtolower($address[1]), $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + break 4; + } + } + break; + default: + if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + break 3; + } + break; } } } @@ -142,13 +177,7 @@ 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; - + $checked = ($checkall == 1) ? ' CHECKED' : ''; $col = 0; if (sizeof($index_order)) { foreach ($index_order as $index_order_part) { @@ -167,8 +196,12 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $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, @@ -177,14 +210,14 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, case 4: /* subject */ $td_str = $bold; if ($thread_sort_messages == 1) { - if (isset($indent_array[$msg["ID"]])) { + if (isset($indent_array[$msg['ID']])) { $td_str .= str_repeat("    ",$indent_array[$msg['ID']]); } } $td_str .= ''."\n".''."\n"; + if ($not_last) { + echo '' . "\n" . '' . "\n"; + } else { + echo ''."\n"; + } } -function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { - $id = get_thread_sort($imapConnection); +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)); - + $id = array_slice($id, ($start_msg-1), $show_num); $end = $start_msg + $show_num - 1; if ($num_msgs < $show_num) { $end_loop = $num_msgs; @@ -264,71 +295,60 @@ function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { } else { $end_loop = $show_num; } - return fillMessageArray($imapConnection,$id,$end_loop); + return fillMessageArray($imapConnection,$id,$end_loop,$show_num); } else { return false; } } +function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { + $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; - } + $num_msgs, $server_sort_order, $mbxresponse) { + $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse); + return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); } function getSelfSortMessages($imapConnection, $start_msg, $show_num, $num_msgs, $sort, $mbxresponse) { - $msgs = array(); - if ($num_msgs >= 1) { - $id = sqimap_get_php_sort_order ($imapConnection, $mbxresponse); - if ($sort < 6 ) { - $end = $num_msgs; - $end_loop = $end; - } else { - /* if it's not sorted */ - if ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; - } - 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; + /* set shownum to 999999 to fool sqimap_get_small_header_list + and rebuild the msgs_str to 1:* */ + $show_num = 999999; + } 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), $show_num); + $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, $show_num); } - $msgs = fillMessageArray($imapConnection,$id,$end_loop); - } - return $msgs; + return $msgs; } @@ -343,6 +363,21 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, global $msgs, $msort, $auto_expunge, $thread_sort_messages, $allow_server_sort, $server_sort_order; + /* + * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc + * so setting it to an empty array beforehand seems to clean up the issue, and stopping the + * "Your script possibly relies on a session side-effect which existed until PHP 4.2.3" error + */ + + if (!isset($msort)) { + $msort = array(); + } + + if (!isset($msgs)) { + $msgs = array(); + } + + //$start = microtime(); /* If autoexpunge is turned on, then do it now. */ $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox); $srt = $sort; @@ -379,30 +414,31 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $mode = ''; } + if ($use_cache) { + sqgetGlobalVar('msgs', $msgs, SQ_SESSION); + sqgetGlobalVar('msort', $msort, SQ_SESSION); + } else { + sqsession_unregister('msort'); + sqsession_unregister('msgs'); + } switch ($mode) { case 'thread': - sqsession_unregister('msort'); - sqsession_unregister('msgs'); - $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, - $num_msgs); + $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(); - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); } else { $msort= $msgs; $sort = 6; - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); } break; case 'serversort': - $msgs = getServerSortMessages($imapConnection, $start_msg, $show_num, - $num_msgs, $sort, $mbxresponse); + $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."). @@ -410,28 +446,23 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $sort = $server_sort_order; $allow_server_sort = FALSE; $msort = $msgs = array(); - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); $id = array(); } else { - $sort = 6; $msort = $msgs; - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); + $sort = 6; } break; default: if (!$use_cache) { - sqsession_unregister('msgs'); - sqsession_unregister('msort'); $msgs = getSelfSortMessages($imapConnection, $start_msg, $show_num, $num_msgs, $sort, $mbxresponse); $msort = calc_msort($msgs, $sort); - sqsession_register($msort, 'msort'); - sqsession_register($msgs, 'msgs'); } /* !use cache */ break; } // switch + sqsession_register($msort, 'msort'); + sqsession_register($msgs, 'msgs'); + } /* if exists > 0 */ $res = getEndMessage($start_msg, $show_num, $num_msgs); @@ -444,23 +475,30 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); do_hook('mailbox_index_before'); - - mail_message_listing_beginning($imapConnection, $mailbox, $sort, - $msg_cnt_str, $paginator_str, $start_msg); - - - echo '
'; + 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); + 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); + 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. - */ + //$t = elapsed($start); + //echo("elapsed time = $t seconds\n"); } function calc_msort($msgs, $sort) { @@ -473,12 +511,19 @@ function calc_msort($msgs, $sort) { * 4 = Subject (up) * 5 = Subject (dn) */ + if (($sort == 0) || ($sort == 1)) { - $msort = array_cleave ($msgs, 'TIME_STAMP'); + foreach ($msgs as $item) { + $msort[] = $item['TIME_STAMP']; + } } elseif (($sort == 2) || ($sort == 3)) { - $msort = array_cleave ($msgs, 'FROM-SORT'); + foreach ($msgs as $item) { + $msort[] = $item['FROM-SORT']; + } } elseif (($sort == 4) || ($sort == 5)) { - $msort = array_cleave ($msgs, 'SUBJECT-SORT'); + foreach ($msgs as $item) { + $msort[] = $item['SUBJECT-SORT']; + } } else { $msort = $msgs; } @@ -492,68 +537,8 @@ function calc_msort($msgs, $sort) { 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; +function fillMessageArray($imapConnection, $id, $count, $show_num=false) { + return sqimap_get_small_header_list($imapConnection, $id, $show_num); } @@ -561,8 +546,7 @@ function fillMessageArray($imapConnection, $id, $count) { 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, + global $imapServerAddress, $use_mailbox_cache, $index_order, $indent_array, $thread_sort_messages, $allow_server_sort, $server_sort_order, $PHP_SELF; @@ -573,7 +557,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, $urlMailbox = urlencode($mailbox); /* get indent level for subject display */ - if ($thread_sort_messages == 1 ) { + if ($thread_sort_messages == 1 && $num_msgs) { $indent_array = get_parent_level($imapConnection); } @@ -597,7 +581,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, /* messages display */ - if ($num_msgs == 0) { + if (!$num_msgs) { /* if there's no messages in this folder */ echo html_tag( 'tr', html_tag( 'td', @@ -621,7 +605,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, next($msort); $k++; } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, + printMessageInfo($imapConnection, $t, true, $key, $mailbox, $real_startMessage, $where, $what); } else { $i = $start_msg; @@ -632,16 +616,17 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, next($msort); $k++; } while (isset ($key) && ($k < $i)); + $not_last = true; do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, - $real_startMessage, $where, $what); + 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 '
'; } /* @@ -680,41 +665,54 @@ function mail_message_listing_beginning ($imapConnection, if (!isset($msg)) { $msg = ''; } - $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox" - . "&startMessage=$start_msg"; + $moveFields = '' . + '' . + ''; + +// $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox" +// . "&startMessage=$start_msg"; /* * This is the beginning of the message list table. * It wraps around all messages */ - - echo "
\n" - . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . + echo '' ."\n" + . $moveFields + . html_tag( 'table' , html_tag( 'tr', html_tag( 'td' , html_tag( 'table' , html_tag( 'tr', html_tag( 'td', $paginator, 'left' ) . - html_tag( 'td', $msg_cnt_str, 'right' ) + 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(_("Transform Selected Messages"), 'right') + 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"; + getMbxList($imapConnection); + echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; + echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; - echo " \n" + echo " \n" . html_tag( 'td', '', 'right', '', 'nowrap' ); + + if (!$auto_expunge) { echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; @@ -722,7 +720,7 @@ function mail_message_listing_beginning ($imapConnection, echo getButton('SUBMIT', 'markRead',_("Read")); echo getButton('SUBMIT', 'markUnread',_("Unread")); - echo getButton('SUBMIT', 'delete',_("Delete")) ." \n"; + echo getButton('SUBMIT', 'delete',_("Delete")) ." \n"; if (!strpos($php_self,'mailbox')) { $location = $php_self.'?mailbox=INBOX&startMessage=1'; } else { @@ -751,15 +749,10 @@ function mail_message_listing_beginning ($imapConnection, , '', '', '' ); } - echo "\n"; - echo "\n"; + echo "\n"; do_hook('mailbox_form_before'); - echo '' - . html_tag( 'tr' ) - . html_tag( 'td' ,'' , '', $color[0], '' ); - /* if using server sort we highjack the * the $sort var and use $server_sort_order * instead. but here we reset sort for a bit @@ -771,8 +764,12 @@ function mail_message_listing_beginning ($imapConnection, } function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { - if ($num_msgs) { - echo html_tag( 'table', + if ($num_msgs) { + /* space between list and footer */ + echo ''; + + echo ''; + echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', html_tag( 'table', @@ -780,12 +777,12 @@ 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'); @@ -794,10 +791,18 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo function printHeader($mailbox, $sort, $color, $showsort=true) { global $index_order; - echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); echo html_tag( 'tr' ,'' , 'center', $color[5] ); - for ($i = 1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { + + /* calculate the width of the subject column based on the + * widths of the other columns */ + $widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5); + $subjectwidth = 100; + foreach($index_order as $item) { + $subjectwidth -= $widths[$item]; + } + + foreach ($index_order as $item) { + switch ($item) { case 1: /* checkbox */ case 5: /* flags */ echo html_tag( 'td' ,' ' , '', '', 'width="1%"' ); @@ -824,7 +829,7 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { echo "\n"; break; case 4: /* subject */ - echo html_tag( 'td' ,'' , 'left', '', '' ) + echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' ) . '' . _("Subject") . ''; if ($showsort) { ShowSortButton($sort, $mailbox, 4, 5); @@ -832,7 +837,7 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { echo "\n"; break; case 6: /* size */ - echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); + echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%" nowrap' ); break; } } @@ -1164,32 +1169,45 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, return ($result); } -function processSubject($subject) { +function processSubject($subject, $threadlevel = 0) { global $languages, $squirrelmail_language; /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') return _("(no subject)"); - if (strlen($subject) <= 55) + $trim_at = 55; + + /* if this is threaded, subtract two chars per indentlevel */ + if($threadlevel > 0 && $threadlevel <= 10) + $trim_at -= (2*$threadlevel); + + if (strlen($subject) <= $trim_at) return $subject; - $ent_strlen = strlen($subject); - $trim_val=50; - $ent_offset=0; + $ent_strlen = $orig_len = strlen($subject); + $trim_val = $trim_at - 5; + $ent_offset = 0; /* * see if this is entities-encoded string * If so, Iterate through the whole string, find out * the real number of characters, and if more - * than 55, substr with an updated trim value. + * 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; + $step = $ent_loc = 0; + while ( $ent_loc < $trim_val && (($ent_loc = strpos($subject, '&', $ent_offset)) !== false) && + (($ent_loc_end = strpos($subject, ';', $ent_loc+3)) !== false) ) { + $trim_val += ($ent_loc_end-$ent_loc); $ent_offset = $ent_loc_end+1; + ++$step; } - - if ($ent_strlen <= 55){ + + if (($trim_val > 50) && (strlen($subject) > ($trim_val))&& (strpos($subject,';',$trim_val) < ($trim_val +6))) { + $i = strpos($subject,';',$trim_val); + if ($i) { + $trim_val = strpos($subject,';',$trim_val); + } + } + if ($ent_strlen <= $trim_at){ return $subject; } @@ -1197,28 +1215,13 @@ function processSubject($subject) { 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 '   '; } @@ -1251,16 +1254,16 @@ function getEndMessage($start_msg, $show_num, $num_msgs) { } function handleAsSent($mailbox) { - global $sent_folder, $draft_folder, $handleAsSent_result; - + global $handleAsSent_result; + /* First check if this is the sent or draft folder. */ - $handleAsSent_result = (($mailbox == $sent_folder) - || ($mailbox == $draft_folder)); + $handleAsSent_result = isSentMailbox($mailbox) || isDraftMailbox($mailbox); /* Then check the result of the handleAsSent hook. */ do_hook('check_handleAsSent_result', $mailbox); /* And return the result. */ - return ($handleAsSent_result); + return $handleAsSent_result; } + ?>