X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=66d80ed8a7932148604f81e3b816f28ecb5d794d;hb=e432a21cf4ec12d42f980beb721645e1f49dff44;hp=15c5e7e919594999e9d2fc991c8b92171d20c587;hpb=13cf639bb63317b98fcb5b607d9e84dbfac5e3a3;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 15c5e7e9..66d80ed8 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,40 +1,113 @@ '; + } else { + $senderName .= $sender_address_part; + $senderAddress .= $sender_address_part; } - $senderName .= sqimap_find_displayable_name($senderNames_part); } } - - if( $mailbox == 'None' ) { - $boxes = sqimap_mailbox_list($imapConnection); - $mailbox = $boxes[0]['unformatted']; - unset( $boxes ); + // If Sent, prefix with To: but only if not Sent folder + if ($bHandleAsSent ^ $bSentFolder) { + $senderName = _("To:") . ' ' . $senderName; + $senderAddress = _("To:") . ' ' . $senderAddress; } - $urlMailbox = urlencode($mailbox); - $subject = processSubject($msg['SUBJECT']); - echo "\n"; - if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { + if ($truncate_sender > 0) + $senderName = truncateWithEntities($senderName, $truncate_sender); + + echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; + + if (isset($aFlags['\\flagged']) && ($aFlags['\\flagged'] == true)) { $flag = ""; $flag_end = ''; } else { $flag = ''; $flag_end = ''; } - if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { + if (!isset($aFlags['\\seen']) || ($aFlags['\\seen'] == false)) { $bold = ''; $bold_end = ''; } else { $bold = ''; $bold_end = ''; } - if (handleAsSent($mailbox)) { + if ($bHandleAsSent) { $italic = ''; $italic_end = ''; } else { $italic = ''; $italic_end = ''; } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { + if (isset($aFlags['\\deleted']) && $aFlags['\\deleted']) { $fontstr = ""; $fontstr_end = ''; } else { @@ -102,26 +206,48 @@ $start_msg, $where, $what){ $fontstr_end = ''; } - /** - * AAAAH! Make my eyes stop bleeding! - * Who wrote this?! - */ - if (sizeof($message_highlight_list)){ + if ($where && $what) { + $searchstr = '&where='.$where.'&what='.$what; + } else { + $searchstr = ''; + } + + $matches = array('TO' => 'sTo', 'CC' => 'sCc', 'FROM' => 'sFrom', 'SUBJECT' => 'sSubject'); + if (is_array($message_highlight_list) && count($message_highlight_list)) { + $sTo = parseAddress($sTo); + $sCc = parseAddress($sCc); foreach ($message_highlight_list as $message_highlight_list_part) { if (trim($message_highlight_list_part['value']) != '') { - if ($message_highlight_list_part['match_type'] == 'to_cc') { - if (strstr('^^' . strtolower($msg['TO']), - strtolower($message_highlight_list_part['value'])) - || strstr('^^'.strtolower($msg['CC']), - strtolower($message_highlight_list_part['value']))) { - $hlt_color = $message_highlight_list_part['color']; - continue; + $high_val = strtolower($message_highlight_list_part['value']); + $match_type = strtoupper($message_highlight_list_part['match_type']); + if($match_type == 'TO_CC') { + $match = array('TO', 'CC'); + } else { + $match = array($match_type); + } + foreach($match as $match_type) { + switch($match_type) { + case('TO'): + case('CC'): + case('FROM'): + foreach ($$matches[$match_type] as $address) { + $address[0] = decodeHeader($address[0], true, false); + $address[1] = decodeHeader($address[1], true, false); + if (strstr('^^' . strtolower($address[0]), $high_val) || + strstr('^^' . strtolower($address[1]), $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + break 4; + } + } + break; + default: + $headertest = strtolower(decodeHeader($$matches[$match_type], true, false)); + if (strstr('^^' . $headertest, $high_val)) { + $hlt_color = $message_highlight_list_part['color']; + break 3; + } + break; } - } 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,642 +256,592 @@ $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); + $col = 0; + $sSubject = str_replace(' ', ' ', decodeHeader($sSubject)); + if (isset($indent_array[$iId])) { + $subject = processSubject($sSubject, $indent_array[$iId]); } else { - $search_stuff = ''; + $subject = processSubject($sSubject, 0); } - - $checked = ($checkall == 1) ? ' checked' : ''; - - if (sizeof($index_order)){ + if (sizeof($index_order)) { foreach ($index_order as $index_order_part) { switch ($index_order_part) { case 1: /* checkbox */ echo html_tag( 'td', - "", - 'center', - $hlt_color ); + addCheckBox("msg[$t]", $checkall, $iId), + 'center', + $hlt_color ); break; case 2: /* from */ + if ($senderAddress != $senderName) { + $senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS))); + $title = ' title="' . str_replace('"', "''", $senderAddress) . '"'; + } + else + $title = ''; echo html_tag( 'td', - $italic . $bold . $flag . $fontstr . $senderName . - $fontstr_end . $flag_end . $bold_end . $italic_end, - '', - $hlt_color ); + $italic . $bold . $flag . $fontstr . $senderName . + $fontstr_end . $flag_end . $bold_end . $italic_end, + 'left', + $hlt_color, $title ); break; case 3: /* date */ + if ($sDate == '') { + $sDate = _("Unknown date"); + } echo html_tag( 'td', - $bold . $flag . $fontstr . $msg['DATE_STRING'] . - $fontstr_end . $flag_end . $bold_end, - 'center', - $hlt_color, - 'nowrap' ); + $bold . $flag . $fontstr . $sDate . + $fontstr_end . $flag_end . $bold_end, + 'center', + $hlt_color, + 'nowrap' ); break; case 4: /* subject */ $td_str = $bold; if ($thread_sort_messages == 1) { - if (isset($indent_array[$msg["ID"]])) { - $td_str .= str_repeat("    ",$indent_array[$msg['ID']]); + if (isset($indent_array[$iId])) { + $td_str .= str_repeat("    ",$indent_array[$iId]); } } - $td_str .= " '; + } + if ($default_use_priority) { + if ( ($iPrio == 1) || ($iPrio == 2) ) { + $td_str .= ' '; + } + else if ($iPrio == 5) { + $td_str .= ' '; + } + else { + $td_str .= ' '; + } + } + if ($sType1 == 'mixed') { + $td_str .= ''; + } else { + $td_str .= ''; + } + + $msg_icon = ''; + if (!isset($aFlags['\\seen']) || ($aFlags['\\seen']) == false) { + $msg_alt = '(' . _("New") . ')'; + $msg_title = '(' . _("New") . ')'; + $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_new'; + } else { + $msg_alt = '(' . _("Read") . ')'; + $msg_title = '(' . _("Read") . ')'; + $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_read'; + } + if (isset($aFlags['\\deleted']) && ($aFlags['\\deleted']) == true) { + $msg_icon .= '_deleted'; + } + if (isset($aFlags['\\answered']) && ($aFlags['\\answered']) == true) { + $msg_alt = '(' . _("Answered") . ')'; + $msg_title = '(' . _("Answered") . ')'; + $msg_icon .= '_reply'; + } + $td_str .= ''. $msg_alt . ''; + $td_str .= ''; + echo html_tag( 'td', + $td_str, + 'right', + $hlt_color, + 'nowrap' ); } - if ($default_use_priority) { - if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { - $td_str .= "!"; + + + // plain text message markers + // + else { + $stuff = false; + $td_str = ""; + if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) { + $td_str .= _("A"); $stuff = true; } - if ($msg['PRIORITY'] == 5) { - $td_str .= "?"; + if ($sType1 == 'mixed') { + $td_str .= '+'; $stuff = true; } + if ($default_use_priority) { + if ( ($iPrio == 1) || ($iPrio == 2) ) { + $td_str .= "!"; + $stuff = true; + } + if ($iPrio == 5) { + $td_str .= "?"; + $stuff = true; + } + } + if (isset($aFlags['\\deleted']) && $aFlags['\\deleted'] == true) { + $td_str .= "D"; + $stuff = true; + } + if (!$stuff) { + $td_str .= ' '; + } + $td_str .= ''; + echo html_tag( 'td', + $td_str, + 'center', + $hlt_color, + 'nowrap' ); } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) { - $td_str .= "D"; - $stuff = true; - } - if (!$stuff) { - $td_str .= ' '; - } - $td_str .= ''; - echo html_tag( 'td', - $td_str, - 'center', - $hlt_color, - 'nowrap' ); break; case 6: /* size */ - echo html_tag( 'td', - $bold . $fontstr . show_readable_size($msg['SIZE']) . - $fontstr_end . $bold_end, - 'right', - $hlt_color ); + $bold . $fontstr . show_readable_size($iSize) . + $fontstr_end . $bold_end, + 'right', + $hlt_color ); break; } + ++$col; } } - echo "\n"; + if ($last) { + echo ''."\n"; + } else { + echo '' . "\n" . '' . "\n"; + } } -/* -* This function loops through a group of messages in the mailbox -* and shows them to the user. +/** +* Does the $sort $_GET var to field mapping +* +* @param int $sort Field to sort on +* @param bool $bServerSort Server sorting is true +* @param mixed $key UNDOCUMENTED +* @return string $sSortField Field tosort on */ -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 getSortField($sort,$bServerSort) { + switch($sort) { + case SQSORT_NONE: + $sSortField = 'UID'; + break; + case SQSORT_DATE_ASC: + case SQSORT_DATE_DEC: + $sSortField = 'DATE'; + break; + case SQSORT_FROM_ASC: + case SQSORT_FROM_DEC: + $sSortField = 'FROM'; + break; + case SQSORT_SUBJ_ASC: + case SQSORT_SUBJ_DEC: + $sSortField = 'SUBJECT'; + break; + case SQSORT_SIZE_ASC: + case SQSORT_SIZE_DEC: + $sSortField = ($bServerSort) ? 'SIZE' : 'RFC822.SIZE'; + break; + case SQSORT_TO_ASC: + case SQSORT_TO_DEC: + $sSortField = 'TO'; + break; + case SQSORT_CC_ASC: + case SQSORT_CC_DEC: + $sSortField = 'CC'; + break; + case SQSORT_INT_DATE_ASC: + case SQSORT_INT_DATE_DEC: + $sSortField = ($bServerSort) ? 'ARRIVAL' : 'INTERNALDATE'; + break; + default: $sSortField = 'DATE'; + break; } + return $sSortField; +} - /* 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) { +function get_sorted_msgs_list($imapConnection,$sort,$mode,&$error) { + $bDirection = ($sort % 2); + $error = false; + switch ($mode) { + case 'thread': $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(); + if ($id === false) { + $error = '
' . + _("Thread sorting is not supported by your IMAP server.") . '
' . + _("Please report this to the system administrator."). + '
'; } - 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)); + break; + case 'server_sort': + $sSortField = getSortField($sort,true); + $id = sqimap_get_sort_order($imapConnection, $sSortField, $bDirection); + if ($id === false) { + $error = '
' . + _( "Server-side sorting is not supported by your IMAP server.") . '
' . + _("Please report this to the system administrator."). + '
'; } + break; + default: + $sSortField = getSortField($sort,false); + $id = get_squirrel_sort($imapConnection, $sSortField, $bDirection); + break; } + return $id; +} - 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)); - } +/** +* This function loops through a group of messages in the mailbox +* and shows them to the user. +* +* @param mixed $imapConnection +* @param string $mailbox mail folder +* @param mixed $num_msgs +* @param mixed $start_msg +* @param mixed $sort +* @param mixed $color +* @param mixed $show_num +* @param mixed $use_cache +* @param mixed $mode +*/ +function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, + $start_msg, $sort, $color, $show_num, + $use_cache, $mode='',$mbxresponse) { + global $msgs, $msort, $auto_expunge, $thread_sort_messages,$server_sort_array, + $allow_server_sort, $server_sort_order; + /* if there's no messages in this folder */ + if ($mbxresponse['EXISTS'] == 0) { + $string = '' . _("THIS FOLDER IS EMPTY") . ''; + echo ' '; + echo ' '; + echo '
'; + echo ' '; + echo ' '; + echo '

'; + echo ' '; + echo ' ' . html_tag( 'td', $string."\n", 'left') + . ''; + echo '
'; + echo '
'; + return; } - /* 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; - } - } - - $real_startMessage = $num_msgs - $start_msg + 1; - $real_endMessage = $num_msgs - $start_msg - $show_num + 2; - if ($real_endMessage <= 0) { - $real_endMessage = 1; - } - $id = array_reverse(range($real_endMessage, $real_startMessage)); - } - $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent); - // $flags = sqimap_get_flags_list($imapConnection, $id, $issent); - if (sizeof($msgs_list)){ - foreach ($msgs_list as $hdr) { - $from[] = $hdr->from; - $date[] = $hdr->date; - $subject[] = $hdr->subject; - $to[] = $hdr->to; - $priority[] = $hdr->priority; - $cc[] = $hdr->cc; - $size[] = $hdr->size; - $type[] = $hdr->type0; - $flag_deleted[] = $hdr->flag_deleted; - $flag_answered[] = $hdr->flag_answered; - $flag_seen[] = $hdr->flag_seen; - $flag_flagged[] = $hdr->flag_flagged; - } - } - } - $j = 0; - if ($sort == 6) { - $end = $start_msg + $show_num - 1; - if ($num_msgs < $show_num) { - $end_loop = $num_msgs; - } else if ($end > $num_msgs) { - $end_loop = $num_msgs - $start_msg + 1; - } else { - $end_loop = $show_num; - } - } else { - $end = $num_msgs; - $end_loop = $end; - } - while ($j < $end_loop) { - if (isset($date[$j])) { - $date[$j] = str_replace(' ', ' ', $date[$j]); - $tmpdate = explode(' ', trim($date[$j])); - } else { - $tmpdate = $date = array('', '', '', '', '', ''); - } - - $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); - $messages[$j]['DATE_STRING'] = - getDateString($messages[$j]['TIME_STAMP']); - $messages[$j]['ID'] = $id[$j]; - $messages[$j]['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]; - + 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 + */ - /* - * 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++; + if($start_msg > $num_msgs) { + $start_msg -= $show_num; + if($start_msg < 1) { + $start_msg = 1; } - */ - $j++; - } - /* - * Only ignore messages flagged as deleted if we are - * using a trash folder or auto_expunge + /* 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 (((isset($move_to_trash) && $move_to_trash) - || (isset($auto_expunge) && $auto_expunge)) - && $sort != 6) { - - /* Find and remove the ones that are deleted */ - $i = 0; - $j = 0; - - while ($j < $num_msgs) { - if (isset($messages[$j]['FLAG_DELETED']) - && $messages[$j]['FLAG_DELETED'] == true) { - $j++; - continue; - } - $msgs[$i] = $messages[$j]; - $i++; - $j++; - } - $num_msgs = $i; + if ($thread_sort_messages == 1) { + $mode = 'thread'; + } else if ($allow_server_sort == 1) { + $mode = 'server_sort'; } else { - if (!isset($messages)) { - $messages = array(); - } - $msgs = $messages; + $mode = ''; } - } - /* There's gotta be messages in the array for it to sort them. */ - if (($num_msgs > 0) && (!$use_cache)) { - /* - * 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'); + if (isset($mbxresponse['SORT_ARRAY']) && is_array($mbxresponse['SORT_ARRAY'])) { + $id = $mbxresponse['SORT_ARRAY']; + if (sqsession_is_registered('msgs')) { + sqsession_unregister('msgs'); + } + $id_slice = array_slice($id,$start_msg-1, $show_num); + if (count($id_slice)) { + $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$show_num); + } else { + return false; + } + sqsession_register($msgs, 'msgs'); } else { - $msort = $msgs; - } - - if ($sort < 6) { - if ($sort % 2) { - asort($msort); + if (sqsession_is_registered('server_sort_array')) { + sqsession_unregister('server_sort_array'); + } + $id = get_sorted_msgs_list($imapConnection,$sort,$mode,$error); + if ($id !== false) { + sqsession_register($id, 'server_sort_array'); + $id_slice = array_slice($id,$start_msg-1, $show_num); + if (count($id_slice)) { + $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$show_num); + } else { + return false; + } + sqsession_register($msgs, 'msgs'); } else { - arsort($msort); + echo $error; + return false; } - } - 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'); -} -/* Generic function to convert the msgs array into an HTML table. */ -function displayMessageArray($imapConnection, $num_msgs, $start_msg, -&$msgs, $msort, $mailbox, $sort, $color, -$show_num) { - - global $folder_prefix, $sent_folder, - $imapServerAddress, $data_dir, $username, $use_mailbox_cache, - $index_order, $real_endMessage, $real_startMessage, $checkall, - $indent_array, $thread_sort_messages, $allow_server_sort, - $server_sort_order; - - /* If cache isn't already set, do it now. */ - if (!session_is_registered('msgs')) { - session_register('msgs'); - } - if (!session_is_registered('msort')) { - session_register('msort'); - } + } + } /* if exists > 0 */ - if ($start_msg + ($show_num - 1) < $num_msgs){ - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; - } + $res = getEndMessage($start_msg, $show_num, $num_msgs); + $start_msg = $res[0]; + $end_msg = $res[1]; - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 1; - } - } + $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg, + $num_msgs, $show_num, $sort); - $urlMailbox = urlencode($mailbox); + $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); do_hook('mailbox_index_before'); +?> + + + + + + + + +
+ +
+ + + + +
+ + + + +
+ +
+
+ +
+ $show_num) { - $end_msg = $show_num; - $start_msg = 1; - } - } - $endVar = $end_msg + 1; +// fix me: +// $color not used +// remove thread stuff +// remove $msgs global and add it as argument (i hate globals) +function displayMessageArray($imapConnection, $num_msgs, $start_msg, + $id, $msgs, $mailbox, $sort, + $show_num, $where=0, $what=0) { + + // if client side sorting and no sort we only fetch num_msgs so the start_msg in the $msgs + // array must be corrected + $i = $start_msg -1; /* * Loop through and display the info for each message. * ($t is used for the checkbox number) */ - $t = 0; - if ($num_msgs == 0) { - /* if there's no messages in this folder */ - echo html_tag( 'tr', - html_tag( 'td', - "
" . _("THIS FOLDER IS EMPTY") . "
 ", - 'center', - $color[4], - 'COLSPAN="' . count($index_order) . '"' - ) - ); - - } elseif ($start_msg == $end_msg) { - /* if there's only one message in the box, handle it differently. */ - if ($sort != 6){ - $i = $start_msg; + + $iEnd = $i + $show_num; + for ($j=$i,$t=0;$j<$iEnd;++$j) { + if (isset($id[$j])) { + $last = (isset($id[$j+1]) || $j == $iEnd) ? false : true; + $msg = $msgs[$id[$j]]; + printMessageInfo($t, $last, $msg, $mailbox, + $start_msg, $where, $what); + ++$t; } else { - $i = 1; + break; } - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, - $real_startMessage, 0, 0); - } 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, - $sort, $real_startMessage, 0, 0); - $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 ""; +/** +* 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 +* @param mixed $imapConnection +* @param array $mbxresponse the array with the results of SELECT against the current mailbox +* @param string $mailbox the current mailbox +* @param mixed $sort the current sorting method (-1 for no sorting available [searches]) +* @param mixed $msg_cnt_str +* @param mixed $paginator +* @param mixed $start_msg */ +function mail_message_listing_beginning ($imapConnection, + $mbxresponse, + $mailbox = '', $sort = -1, + $msg_cnt_str = '', + $paginator = ' ', + $start_msg = 1) { + global $color, $auto_expunge, $base_uri, $show_flag_buttons, + $allow_server_sort, $server_sort_order, + $PHP_SELF, $allow_thread_sort, $thread_sort_messages; + + $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); -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; + if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) { + $source_url = $regs[1]; + } else { + $source_url = $php_self; + } - $urlMailbox = urlencode($mailbox); + if (!isset($msg)) { + $msg = ''; + } + + if (!strpos($php_self,'?')) { + $location = $php_self.'?mailbox=INBOX&startMessage=1'; + } else { + $location = $php_self; + } + + $moveFields = addHidden('msg', $msg). + addHidden('mailbox', $mailbox). + addHidden('startMessage', $start_msg). + addHidden('location', $location); + + /* build 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"); + } + $thread_link_str = '[' . $thread_name + . ']'; + } + else + $thread_link_str =''; /* * 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' ) - . '   ' - . ' ' - . ' \n" . "\n"; - - echo " \n" - . " \n" - . " \n"; + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox); + $form_name = "FormMsgs" . $safe_name; + + echo '' ."\n" + . $moveFields; +?> +
"; - if (!$auto_expunge) { - echo ' ' . _("mailbox") . ' '; - } - echo '' - . '' - . ' ' - . "
+ + + + + + +
+ + + + + + +
+
+ + + '; - } + echo getButton('SUBMIT', 'attache',_("Forward")); + echo ' '; + if (array_search('\\deleted',$mbxresponse['PERMANENTFLAGS'], true) !== FALSE) { + echo getButton('SUBMIT', 'delete',_("Delete")); + echo '' . _("Bypass Trash"); + echo ' '; + } + if (!$auto_expunge && $mbxresponse['RIGHTS'] != 'READ-ONLY') { + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; + echo ' '; + } + do_hook('mailbox_display_buttons'); + ?> + + + '; + //echo $thread_link_str; //previous behaviour + getMbxList($imapConnection); + echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n + "; + } + ?> + + +
+  ' . $thread_name - . ' 
+
- echo "
\n"; +' - . "" - . '" - . ""; + /* if using server sort we highjack the * the $sort var and use $server_sort_order * instead. but here we reset sort for a bit @@ -774,56 +850,135 @@ $start_msg = 1) { if ($allow_server_sort == TRUE) { $sort = $server_sort_order; } - /* Print the headers. */ - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { +} + +/** +* FIXME: Undocumented function +* +* @param mixed $num_msgs +* @param mixed $paginator_str +* @param mixed $msg_cnt_str +* @param mixed $color +*/ +function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { +if ($num_msgs) { + /* space between list and footer */ +?> + + + + +\n"; +} + +/** +* FIXME: Undocumented function +* +* @param string $mailbox +* @param mixed $sort +* @param mixed $color +* @param bool $showsort +* @param mixed $start_msg +*/ +function printHeader($mailbox, $sort, $color, $showsort=true, $start_msg=1) { + global $index_order, $internal_date_sort; + echo html_tag( 'tr' ,'' , 'center', $color[5] ); + + /* calculate the width of the subject column based on the + * widths of the other columns */ + $widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5); + $subjectwidth = 100; + foreach($index_order as $item) { + $subjectwidth -= $widths[$item]; + } + + foreach ($index_order as $item) { + switch ($item) { case 1: /* checkbox */ + echo html_tag( 'td',get_selectall_link($start_msg, $sort, $mailbox) , '', '', 'width="1%"' ); + break; 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%"' ); + echo html_tag( 'td', '', 'center','','width="5%" nowrap') + . '' . _("Size") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC); + } + echo "\n"; 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? +* +* @param mixed $sort +* @param string $mailbox +* @param mixed $Down +* @param mixed $Up */ -function ShowSortButton($sort, $mailbox, $Up, $Down) { +function ShowSortButton($sort, $mailbox, $Down, $Up ) { + global $PHP_SELF; + /* Figure out which image we want to use. */ if ($sort != $Up && $sort != $Down) { $img = 'sort_none.png'; @@ -833,43 +988,62 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) { $which = $Down; } else { $img = 'down_pointer.png'; - $which = 6; + $which = 0; + } + + 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) { - global $checkall, $what, $where, $mailbox, $javascript_on; +/** +* FIXME: Undocumented function +* +* @param mixed $start_msg +* @param mixed $sort +* @param string $mailbox +*/ +function get_selectall_link($start_msg, $sort, $mailbox) { + global $checkall, $what, $where, $javascript_on; global $PHP_SELF, $PG_SHOWNUM; $result = ''; if ($javascript_on) { - $result = - '' . _("Toggle All") - . "\n"; + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox); + $func_name = "CheckAll" . $safe_name; + $form_name = "FormMsgs" . $safe_name; + $result = '' + . ''; +// . ' . _("Toggle All") +// . "\n"; } else { if (strpos($PHP_SELF, "?")) { $result .= "%s to %s (%s total)"), - $start_msg, $end_msg, $num_msgs); + $result = sprintf(_("Viewing Messages: %s to %s (%s total)"), + ''.$start_msg.'', ''.$end_msg.'', $num_msgs); } else if ($start_msg == $end_msg) { - $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg); + $result = sprintf(_("Viewing Message: %s (1 total)"), ''.$start_msg.''); } else { - $result = '
'; + $result = '
'; } - /* Return our result string. */ return ($result); } -/* +/** * Generate a paginator link. +* +* @param mixed $box +* @param mixed $start_msg +* @param mixed $use +* @param string $text text used for paginator link +* @return string */ function get_paginator_link($box, $start_msg, $use, $text) { - $result = "$text"; + + $result = "$text"; + return ($result); } -/* +/** * This function computes the paginator string. +* +* @param mixed $box +* @param mixed $start_msg +* @param mixed $end_msg +* @param integer $num_msgs +* @param mixed $show_num +* @param mixed $sort */ 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. */ @@ -969,9 +1156,9 @@ $show_num, $sort) { $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"; + $nxt_str = _("Next"); } else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) { - $prv_str = ""._("Previous") . ''; + $prv_str = _("Previous"); $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); } @@ -992,7 +1179,7 @@ $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, @@ -1013,15 +1200,15 @@ $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); - $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75); + $extra_pgs -= ceil(($cur_pg - $q1_pgs - 1) * 3/4); + $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 3/4); $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; @@ -1029,11 +1216,11 @@ $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); - $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); + $extra_pgs -= ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4); + $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4); $q1_pgs += floor($extra_pgs / 2); $q2_pgs += ceil($extra_pgs / 2); } @@ -1043,7 +1230,7 @@ $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) . '
'; + * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; */ /* Print out the page links from the compute page quarters. */ @@ -1089,32 +1276,32 @@ $show_num, $sort) { } } } else if ($PG_SHOWNUM == 999999) { - $pg_str = "" ._("Paginate") . '' . $spc; + $pg_str = "" ._("Paginate") . ''; } - /* 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 = ''; + if ( $prv_str != '' || $nxt_str != '' ) + { + $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); + $result .= ($nxt_str != '' ? $nxt_str : ''); + $result .= ']' . $spc ; + + /* Compute the 'show all' string. */ + $all_str = "" . _("Show All") . ''; + } + + $result .= ($pg_str != '' ? $spc . '['.$spc.$pg_str.']' . $spc : ''); + $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : ''); /* If the resulting string is blank, return a non-breaking space. */ if ($result == '') { @@ -1125,49 +1312,153 @@ $show_num, $sort) { return ($result); } -function processSubject($subject) { - /* Shouldn't ever happen -- caught too many times in the IMAP functions */ - if ($subject == '') - return _("(no subject)"); +/** +* FIXME: Undocumented function +*/ +function truncateWithEntities($subject, $trim_at) +{ + $ent_strlen = strlen($subject); + if (($trim_at <= 0) || ($ent_strlen <= $trim_at)) + return $subject; - if (strlen($subject) <= 55) - return $subject; + global $languages, $squirrelmail_language; - $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. + * than $trim_at, 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; + $trim_val = $trim_at; + $ent_offset = 0; + $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; } - - if ($ent_strlen <= 55){ + if (($trim_val > $trim_at) && ($ent_strlen > $trim_val) && (strpos($subject,';',$trim_val) < ($trim_val + 6))) { + $i = strpos($subject,';',$trim_val); + if ($i) { + $trim_val = strpos($subject,';',$trim_val); + } + } + // only print '...' when we're actually dropping part of the subject + if ($ent_strlen <= $trim_val) 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) . '...'; + return substr_replace($subject, '...', $trim_val); } +/** +* FIXME: Undocumented function +*/ +function processSubject($subject, $threadlevel = 0) { + /* Shouldn't ever happen -- caught too many times in the IMAP functions */ + if ($subject == '') { + return _("(no subject)"); + } + + global $truncate_subject; /* number of characters for Subject field (<= 0 for unchanged) */ + $trim_at = $truncate_subject; + + /* if this is threaded, subtract two chars per indentlevel */ + if (($threadlevel > 0) && ($threadlevel <= 10)) + $trim_at -= (2*$threadlevel); + + return truncateWithEntities($subject, $trim_at); +} + +/** +* FIXME: Undocumented function +* +* @param mixed $imapConnection +* @param mixed $boxes +*/ +function getMbxList($imapConnection, $boxes = 0) { + global $lastTargetMailbox; + echo '   '; +} + +/** +* Creates button +* +* @deprecated see form functions available in 1.5.1 and 1.4.3. +* @param string $type +* @param string $name +* @param string $value +* @param string $js +* @param bool $enabled +*/ +function getButton($type, $name, $value, $js = '', $enabled = TRUE) { + $disabled = ( $enabled ? '' : 'disabled ' ); + $js = ( $js ? $js.' ' : '' ); + return ''; +} + +/** +* Puts string into cell, aligns it and adds tag +* +* @param string $string string +* @param string $align alignment +*/ +function getSmallStringCell($string, $align) { + return html_tag('td', + '' . $string . ':  ', + $align, + '', + 'nowrap' ); +} + +/** +* FIXME: Undocumented function +* +* @param integer $start_msg +* @param integer $show_num +* @param integer $num_msgs +*/ +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)); +} + +/** +* This should go in imap_mailbox.php +* @param string $mailbox +*/ 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; } -?> \ No newline at end of file +?>
+ + + + +
+ + + + + +
+
+
' . _("To") . ''; + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("To") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, SQSORT_TO_ASC, SQSORT_TO_DEC); + } } else { - echo ' ' . _("From") . ''; - } - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 2, 3); + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + . '' . _("From") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, SQSORT_FROM_ASC, SQSORT_FROM_DEC); + } } - echo "' . _("Date") . ''; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 0, 1); + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + . '' . _("Date") . ''; + if ($showsort) { + if ($internal_date_sort) { + ShowSortButton($sort, $mailbox, SQSORT_INT_DATE_ASC, SQSORT_INT_DATE_DEC); + } else { + ShowSortButton($sort, $mailbox, SQSORT_DATE_ASC, SQSORT_DATE_DEC); + } } - echo "' . _("Subject") . ' '; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 4, 5); + case 4: /* subject */ + echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' ) + . '' . _("Subject") . ''; + if ($showsort) { + ShowSortButton($sort, $mailbox, SQSORT_SUBJ_ASC, SQSORT_SUBJ_DEC); } - echo "