/**
* 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
$senderName = sqimap_find_displayable_name($msg['FROM']);
}
- $subject = processSubject($msg['SUBJECT']);
+ $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]);
echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
* AAAAH! Make my eyes stop bleeding!
* Who wrote this?!
*/
- if (sizeof($message_highlight_list)){
+ if (is_array($message_highlight_list) && count($message_highlight_list)){
foreach ($message_highlight_list as $message_highlight_list_part) {
if (trim($message_highlight_list_part['value']) != '') {
$high_val = strtolower($message_highlight_list_part['value']);
break;
case 2: /* from */
echo html_tag( 'td',
- $italic . $bold . $flag . $fontstr . $senderName .
+ $italic . $bold . $flag . $fontstr . htmlentities($senderName) .
$fontstr_end . $flag_end . $bold_end . $italic_end,
'left',
$hlt_color );
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']]);
}
}
* 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;
}
$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);
}
/* messages display */
- if ($num_msgs == 0) {
+ if (!$num_msgs) {
/* if there's no messages in this folder */
echo html_tag( 'tr',
html_tag( 'td',
function printHeader($mailbox, $sort, $color, $showsort=true) {
global $index_order;
echo html_tag( 'tr' ,'' , 'center', $color[5] );
- for ($i = 1; $i <= count($index_order); $i++) {
- switch ($index_order[$i]) {
+
+ /* 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%"' );
echo "</td>\n";
break;
case 4: /* subject */
- echo html_tag( 'td' ,'' , 'left', '', '' )
+ echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' )
. '<b>' . _("Subject") . '</b>';
if ($showsort) {
ShowSortButton($sort, $mailbox, 4, 5);
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, substract two chars per indentlevel */
+ if($threadlevel > 0 && $threadlevel <= 10)
+ $trim_at -= (2*$threadlevel);
+
+ if (strlen($subject) <= $trim_at)
return $subject;
$ent_strlen = strlen($subject);
- $trim_val=50;
- $ent_offset=0;
+ $trim_val = $trim_at - 5;
+ $ent_offset = 0;
/*
* see if this is entities-encoded string
* If so, Iterate through the whole string, find out
$ent_offset = $ent_loc_end+1;
}
- if ($ent_strlen <= 55){
+ if ($ent_strlen <= $trim_at){
return $subject;
}