X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=13f185a37b5b08af6bdf10579da967d8d823c806;hp=e016737b253cd656b271827745f706c3e5d85c68;hb=9cd67a0aaf90b09c40015c89e21fc2aea3dc7bf2;hpb=8d53b72a0907eaa731d799c375eb4dd713e45714
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e016737b..13f185a3 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -13,6 +13,8 @@
*/
require_once('../functions/strings.php');
+require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/html.php');
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
@@ -190,11 +192,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;
}
@@ -412,8 +414,9 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
}
$num++;
}
- $j++;
*/
+ $j++;
+
}
/*
@@ -603,11 +606,12 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
}
echo ''
- . "
"
+ . html_tag( 'table', '',
+ "bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 cellspacing=1" )
+ . " |
"
. "$paginator_str | "
- . "$msg_cnt_str | "
+ . html_tag( 'td', 'right' ) . "$msg_cnt_str |
"
. "";
/* End of message-list table */
@@ -625,6 +629,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 +637,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 "