Changeset 17fc718 in github

Timestamp:

Oct 14, 2005 6:21:46 AM (8 years ago)

Author:

svncommit <devs@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

d206c1f

Parents:

2c12662

Message:

minor improvment on reading headers

File:

• program/include/rcube_imap.inc (modified) (3 diffs)

program/include/rcube_imap.inc

@@ -298 +298 @@
     {
     $max = $this->_messagecount($mailbox /*, 'ALL', TRUE*/);
-    $a_out = array();
     
     if (!strlen($mailbox))
-      return $a_out;
-
+      return array();
 
     // get cached headers
@@ -315 +313 @@
       $a_msg_headers = array();
       foreach ($a_header_index as $i => $headers)
-        $a_msg_headers[$headers->uid] = $headers;
+                if (!$headers->deleted)
+                        $a_msg_headers[$headers->uid] = $headers;
         
 // print "/**** fetch headers ****/\n";
@@ -324 +323 @@
     // sort headers by a specific col
     $a_headers = iil_SortHeaders($a_msg_headers, $sort_field, $sort_order);
-    
+        // free memory
+        unset($a_msg_headers);
+        
     // write headers list to cache
     if (!$headers_cached)
-      $this->update_cache($mailbox.'.msg', $a_msg_headers);
-
-    if (is_array($a_headers))
-      foreach ($a_headers as $header)
-        if (!$header->deleted)
-          $a_out[] = $header;
+      $this->update_cache($mailbox.'.msg', $a_headers);
 
     // return complete list of messages
     if (strtolower($page)=='all')
-      return $a_out;
-
+      return $a_headers;
+        
     $start_msg = ($this->list_page-1) * $this->page_size;
-    return array_slice($a_out, $start_msg, $this->page_size);
+    return array_slice($a_headers, $start_msg, $this->page_size);
     }