From 0811196de3083e5a6da6706f88bfe07a4c6d08d9 Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 1 May 2002 11:03:17 +0000 Subject: [PATCH] Move away the sqimap_get_flags_list call because now sqimap_get_small_header_list provides the flags. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2787 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 61b68218..f05e7af7 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -325,7 +325,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $id = array_reverse(range($real_endMessage, $real_startMessage)); } $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent); - $flags = sqimap_get_flags_list($imapConnection, $id, $issent); +// $flags = sqimap_get_flags_list($imapConnection, $id, $issent); if (sizeof($msgs_list)){ foreach ($msgs_list as $hdr) { $from[] = $hdr->from; @@ -336,6 +336,10 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $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; } } } @@ -375,6 +379,11 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $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: @@ -389,7 +398,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $messages[$j]['SUBJECT-SORT'], $matches)){ $messages[$j]['SUBJECT-SORT'] = $matches[2]; } - +/* $num = 0; while ($num < count($flags[$j])) { if ($flags[$j][$num] == 'Deleted') { @@ -402,6 +411,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $messages[$j]['FLAG_FLAGGED'] = true; } $num++; +*/ } $j++; } -- 2.25.1