/**
* 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
/* 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,
if (handleAsSent($mailbox)) {
$msg['FROM'] = $msg['TO'];
+ }
+ $msg['FROM'] = parseAddress($msg['FROM']);
+
/*
* 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 = "<font color=\"$color[2]\">";
* 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']) != '') {
- 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;
- }
- } 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;
- }
+ $high_val = strtolower($message_highlight_list_part['value']);
+ $match_type = strtoupper($message_highlight_list_part['match_type']);
+ switch($match_type) {
+ case('TO'):
+ case('TO_CC'):
+ foreach ($msg['TO'] 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'];
+ continue;
+ }
+ }
+ if($match_type != 'TO_CC') {
+ break;
+ }
+ case('CC'):
+ foreach ($msg['CC'] 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'];
+ continue;
+ }
+ }
+ break;
+ case('FROM'):
+ foreach ($msg['FROM'] 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'];
+ continue;
+ }
+ }
+ break;
+ default:
+ if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
+ break;
}
}
}
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) {
$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,
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 .= '<a href="read_body.php?mailbox='.$urlMailbox
. '&passed_id='. $msg["ID"]
. '&startMessage='.$start_msg.$searchstr.'"';
- do_hook("subject_link");
+ $td_str .= ' ' .concat_hook_function('subject_link');
if ($subject != $msg['SUBJECT']) {
$title = get_html_translation_table(HTML_SPECIALCHARS);
$title = array_flip($title);
if (!$stuff) {
$td_str .= ' ';
}
+ do_hook("msg_envelope");
$td_str .= '</small></b>';
echo html_tag( 'td',
$td_str,
++$col;
}
}
- echo '</tr>'."\n".'<tr><td colspan="'.$col.'" BGCOLOR="'.
- $color[0].'" HEIGHT="1"></td></tr>'."\n";
+ if ($not_last) {
+ echo '</tr>' . "\n" . '<tr><td COLSPAN="' . $col . '" BGCOLOR="' .
+ $color[0] . '" HEIGHT="1"></td></tr>' . "\n";
+ } else {
+ echo '</tr>'."\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;
}
}
+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;
+ } 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);
}
- $msgs = fillMessageArray($imapConnection,$id,$end_loop);
- }
- return $msgs;
+ return $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;
$mode = '';
}
+ 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 '<b><small><center><font color=red>' .
_("Thread sorting is not supported by your IMAP server.<br>Please report this to the system administrator.").
'</center></small></b>';
$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 '<b><small><center><font color=red>' .
_( "Server-side sorting is not supported by your IMAP server.<br>Please report this to the system administrator.").
$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);
$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 '<table bgcolor="' . $color[0] . '" border="0" width="100%" cellpadding="1" cellspacing="0"><tr><td>';
+ echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
+ echo '<tr><td>';
+
+ mail_message_listing_beginning($imapConnection, $mailbox, $sort,
+ $msg_cnt_str, $paginator_str, $start_msg);
+ echo '</td></tr>';
+ /* line between the button area and the list */
+ echo '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'"></td></tr>';
+
+ echo '<tr><td>';
+ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+ echo ' <tr><td>';
+ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[5].'">';
+ echo '<tr><td>';
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 '</td></tr></table></td></tr></table>';
- 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 '</td></tr></table>';
-
- /**
- * 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) {
* 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;
}
}
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;
+ return sqimap_get_small_header_list($imapConnection, $id);
}
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;
$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',
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox,
- $real_startMessage, $where, $what);
+ printMessageInfo($imapConnection, $t, true, $key, $mailbox,
+ $real_startMessage, $where, $what);
} else {
$i = $start_msg;
reset($msort);
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 '</table>';
}
/*
if (!isset($msg)) {
$msg = '';
}
- $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
- . "&startMessage=$start_msg";
+ $moveFields = '<input type="hidden" name="msg" value="'.htmlspecialchars($msg).'">' .
+ '<input type="hidden" name="mailbox" value="'.htmlspecialchars($mailbox).'">' .
+ '<input type="hidden" name="startMessage" value="'.htmlspecialchars($start_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 "<FORM name=\"messageList\" method=post action=\"$moveURL\">\n"
- . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) .
+ echo '<form name="messageList" method="post" action="move_messages.php">' ."\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 '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'"></td></tr>';
+
+ echo '<tr><td>';
+ echo html_tag( 'tr' ) . "\n"
+ . html_tag( 'td' ,'' , 'left', '', '' )
+ . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="0"' )
+ . '<tr><td>'
+ . 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 " </TD>\n"
+ echo " </TD>\n"
. 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";
+ echo getButton('SUBMIT', 'delete',_("Delete")) ." \n";
if (!strpos($php_self,'mailbox')) {
$location = $php_self.'?mailbox=INBOX&startMessage=1';
} else {
, '', '', '' );
}
- echo "</TABLE>\n";
- echo "</table>\n";
+ echo "</TABLE></td></tr></table></td></tr>\n";
do_hook('mailbox_form_before');
- echo '</td></tr>'
- . 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
}
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 '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'" COLSPAN="1">';
+
+ echo '</td></tr><tr><td>';
+ echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
html_tag( 'table',
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 '</td></tr>';
+ }
/* End of message-list table */
do_hook('mailbox_index_after');
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%"' );
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);
echo "</td>\n";
break;
case 6: /* size */
- echo html_tag( 'td', '<b>' . _("Size") . '</b>', 'center', '', 'width="5%"' );
+ echo html_tag( 'td', '<b>' . _("Size") . '</b>', 'center', '', 'width="5%" nowrap' );
break;
}
}
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;
}
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 ' <small> <tt><select name="targetMailbox">';
- $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 " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
- } else {
- echo " <OPTION VALUE=\"$box\">$box2</OPTION>\n";
- }
- }
- }
+ echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)) );
echo ' </SELECT></TT> ';
}
}
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;
}
+
?>
projects / squirrelmail.git / blobdiff