X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3c412693200f800e502b12216387a4275a5506fc;hp=f05e7af7f3f33d512c98dbb6ee636d5aecb4614b;hb=869ece5d542664e592ec632eb2612a92dca90c9a;hpb=0811196de3083e5a6da6706f88bfe07a4c6d08d9 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index f05e7af7..3c412693 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -13,6 +13,7 @@ */ require_once('../functions/strings.php'); +require_once('../functions/imap_utf7_decode_local.php'); /* Default value for page_selector_max. */ define('PG_SEL_MAX', 10); @@ -190,11 +191,11 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $stuff = true; } if ($default_use_priority) { - if ( ($msg['PRIORITY'][0] == 1) || ($msg['PRIORITY'][0] == 2) ) { + if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { echo "!\n"; $stuff = true; } - if ($msg['PRIORITY'][0] == 5) { + if ($msg['PRIORITY'] == 5) { echo "?\n"; $stuff = true; } @@ -411,9 +412,10 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $messages[$j]['FLAG_FLAGGED'] = true; } $num++; -*/ } +*/ $j++; + } /* @@ -625,6 +627,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, * $Message is a message that is centered on top of the list * $More is a second line that is left aligned */ + function mail_message_listing_beginning ($imapConnection, $moveURL, $mailbox = '', $sort = -1, $msg_cnt_str = '', @@ -632,14 +635,16 @@ function mail_message_listing_beginning ($imapConnection, $moveURL, $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; + $allow_thread_sort, $allow_server_sort, $server_sort_order, + $lastTargetMailbox; + $urlMailbox = urlencode($mailbox); /* * This is the beginning of the message list table. * It wraps around all messages */ - echo "