[SM-CVS] CVS: squirrelmail/functions imap_search.php,1.50,1.51

[Marc G. K. <st...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv2851/functions

Modified Files:
	imap_search.php 
Log Message:

Move away the sqimap_get_flags_list call because now
sqimap_get_small_header_list provides the flags.


Index: imap_search.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_search.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -w -r1.50 -r1.51
--- imap_search.php	5 Apr 2002 04:09:04 -0000	1.50
+++ imap_search.php	1 May 2002 11:01:59 -0000	1.51
@@ -98,7 +98,8 @@
     }
     $issent = ($mailbox == $sent_folder);
     $hdr_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);
+
     foreach ($hdr_list as $hdr) {
         $from[] = $hdr->from;
         $date[] = $hdr->date;
@@ -108,6 +109,10 @@
         $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;
     }
 
     $j = 0;
@@ -127,7 +132,11 @@
             $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];
+/*
             $num = 0;
             while ($num < count($flags[$j])) {
                 if ($flags[$j][$num] == 'Deleted') {
@@ -141,7 +150,9 @@
                 }
                 $num++;
             }
+*/	    
             $j++;
+
     }
 
     /* Find and remove the ones that are deleted */