X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=1a304005bd4e146f772bb3f8b11aef5eb3a8519c;hb=1681f4d9d7070f1bfc4f9f5ce46b39caa8142537;hp=d209aa51c13503596d4d1828c9cac3104c597f21;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index d209aa51..1a304005 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,6 +12,8 @@ * $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) { @@ -21,6 +23,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start global $default_use_priority; global $message_highlight_list; global $index_order; + global $pos; /* Search postion (if any) */ $color_string = $color[4]; if ($GLOBALS['alt_index_colors']) { @@ -35,7 +38,19 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start } $msg = $msgs[$key]; - $senderName = htmlspecialchars(sqimap_find_displayable_name($msg['FROM'])); + /** + * This is done in case you're looking into Sent folders, + * because you can have multi receiver. + */ + $sendersName = split(',', $msg['FROM']); + $senderName = ''; + for ($index = 0 ; $index < count($sendersName) ; $index++) { + if ($senderName != '') { + $senderName .= ', '; + } + $senderName .= sqimap_find_displayable_name($sendersName[$index]); + } + if( $mailbox == 'None' ) { // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection); @@ -48,7 +63,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start echo "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { - $flag = ""; + $flag = ""; $flag_end = ''; } else { $flag = ''; @@ -97,7 +112,10 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start } if ($where && $what) { - $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); + if( !isset( $pos ) || $pos == '' ) { + $pos = '0'; + } + $search_stuff = "&pos=" . urlencode( $pos ) . "&where=".urlencode($where).'&what='.urlencode($what); } $checked = ($checkall == 1 ?' checked' : ''); @@ -105,16 +123,16 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: /* checkbox */ - echo " \n"; + echo " \n"; break; case 2: /* from */ - echo " $italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end\n"; + echo " $italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end\n"; break; case 3: /* date */ - echo "
$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end
\n"; + echo "
$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end
\n"; break; case 4: /* subject */ - echo " $bold"; + echo " $bold"; if (! isset($search_stuff)) { $search_stuff = ''; } echo "\n"; + echo " \n"; if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { echo "A\n"; @@ -142,11 +160,11 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start } if ($default_use_priority) { if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) { - echo "!\n"; + echo "!\n"; $stuff = true; } if (ereg('(5)',substr($msg['PRIORITY'],0,1))) { - echo "?\n"; + echo "?\n"; $stuff = true; } } @@ -161,7 +179,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start echo "\n"; break; case 6: /* size */ - echo " $bold$fontstr" . + echo " $bold$fontstr" . show_readable_size($msg['SIZE']) . "$fontstr_end$bold_end\n"; break; @@ -175,8 +193,8 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start * and shows them to the user. */ function showMessagesForMailbox - ($imapConnection, $mailbox, $num_msgs, $start_msg, - $sort, $color,$show_num, $use_cache) { +($imapConnection, $mailbox, $num_msgs, $start_msg, $sort, + $color, $show_num, $use_cache) { global $msgs, $msort; global $sent_folder, $draft_folder; global $message_highlight_list; @@ -445,11 +463,11 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms } echo ''. - "" . - "" . - "
". + "
$paginator_str
" . + "". + "". "
" . + "". "
$paginator_str$msg_cnt_str
". - "
"; /** End of message-list table */ @@ -478,7 +496,8 @@ function mail_message_listing_beginning * This is the beginning of the message list table. * It wraps around all messages */ - echo "\n" + echo "\n" + . "
\n" . "' . "
" . " \n" . " \n" @@ -486,18 +505,17 @@ function mail_message_listing_beginning . "
$paginator
\n" . '
\n" - . "\n" . "\n" . " \n" - . " \n" . " \n" . " \n" . " \n" - . " \n". " '. "
\n" - . '  ' . _("Move selected to:") . "\n" + . " \n" + . '  ' . _("Move Selected To:") . "\n" . " \n" . '  ' . _("Transform Selected Messages") . ":  
\n" . "
\n" + . " \n" . '  '. - "\n". + echo '  '. + "\n". "    \n"; if (!$auto_expunge) { @@ -525,7 +543,7 @@ function mail_message_listing_beginning echo '
". - "\n" . - '' . _("Toggle All") . "\n"; + '' . _("Toggle All") . "\n"; } else { $result .= ""; if (isset($checkall) && ($checkall == '1')) { @@ -675,7 +698,7 @@ function get_paginator_link */ function get_paginator_str ($box, $start_msg, $end_msg, $num_msgs, $show_num, $sort) { - global $username, $data_dir, $use_mailbox_cache, $color; + global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; /* Initialize paginator string chunks. */ $prv_str = ''; @@ -832,11 +855,15 @@ function get_paginator_str $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; } } + } else if ($PG_SHOWNUM == 999999) { + $pg_str = "" + . _("Paginate") . '' . $spc; } /* If necessary, compute the 'show all' string. */ if (($prv_str != '') || ($nxt_str != '')) { - $all_str = "" . _("Show All") . ''; } @@ -846,11 +873,11 @@ function get_paginator_str /* Put all the pieces of the paginator string together. */ $result = ''; - $result .= ($all_str != '' ? $all_str . $spc . $sep . $spc: ''); $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); - $result .= ($pg_str != '' ? $pg_str . $sep . $spc : ''); - $result .= ($nxt_str != '' ? $nxt_str : ''); - $result .= ($result != '' ? $spc . $sep . $spc . $tgl_str: $tgl_str); + $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); /* If the resulting string is blank, return a non-breaking space. */ if ($result == '') {