X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=42bfada00a38b7090e9974582463c538da1e89c5;hb=856b2ee25a1cd7e05dd5ccdbe9d0e4744673351a;hp=1fdcc78c5bc8bc3ad7d39b2d3111c13d74c7c51c;hpb=e14ded6ef714aef3e09ee4698aa2229e8a63b1e1;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 1fdcc78c..42bfada0 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,25 +12,29 @@ * $Id$ */ +require_once('../functions/strings.php'); + define('PG_SEL_MAX', 10); /* Default value for page_selector_max. */ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start_msg, $where, $what) { - global $checkall; - global $color, $msgs, $msort; - global $sent_folder, $draft_folder; - global $default_use_priority; - global $message_highlight_list; - global $index_order; - global $pos; /* Search postion (if any) */ + global $checkall, + $color, $msgs, $msort, + $sent_folder, $draft_folder, + $default_use_priority, + $message_highlight_list, + $index_order, + $pos; /* Search postion (if any) */ $color_string = $color[4]; if ($GLOBALS['alt_index_colors']) { - if (!isset($GLOBALS["row_count"])) { - $GLOBALS["row_count"] = 0; + if (!isset($GLOBALS['row_count'])) { + $GLOBALS['row_count'] = 0; } - $GLOBALS["row_count"]++; - if ($GLOBALS["row_count"] % 2) { - if (!isset($color[12])) $color[12] = '#EAEAEA'; + $GLOBALS['row_count']++; + if ($GLOBALS['row_count'] % 2) { + if (!isset($color[12])) { + $color[12] = '#EAEAEA'; + } $color_string = $color[12]; } } @@ -41,11 +45,13 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start * because you can have multi receiver. */ $sendersName = split(',', $msg['FROM']); - for( $index = 0 ; $index < count($sendersName) ; $index++ ) { - if( strlen($senderName) > 0 ) + $senderName = ''; + for ($index = 0 ; $index < count($sendersName) ; $index++) { + if ($senderName != '') { $senderName .= ', '; - $senderName .= sqimap_find_displayable_name($sendersName[$index]); } + $senderName .= sqimap_find_displayable_name($sendersName[$index]); + } if( $mailbox == 'None' ) { // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); @@ -147,7 +153,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start echo "