Changeset 2b5c123 in github

Timestamp:

Dec 12, 2008 6:57:20 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

cf6bc5d

Parents:

f50cc72

Message:

#1485622: fix rcube_imap::message_index() to return always messages IDs

File:

• program/include/rcube_imap.php (modified) (5 diffs)

program/include/rcube_imap.php

@@ -108 +108 @@
     $IMAP_USE_INTERNAL_DATE = false;
 
-    $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type ? $auth_type : 'check'));
+    // set connection options
+    $options['imap'] = $auth_type ? $auth_type : 'check';
+
+    // Setting root and delimiter before iil_Connect can save time detecting them
+    // using NAMESPACE and LIST 
+    if (is_string($imap_root = rcmail::get_instance()->config->get('imap_root'))) 
+        $options['rootdir'] = $imap_root;
+    if($imap_delimiter = rcmail::get_instance()->config->get('imap_delimiter'))
+        $options['delimiter'] = $imap_delimiter;
+
+    $this->conn = iil_Connect($host, $user, $pass, $options);
     $this->host = $host;
     $this->user = $user;
@@ -812 +822 @@
     if (!isset($this->cache[$key]) && $this->search_string && $mailbox == $this->mailbox)
     {
-      $this->cache[$key] = $a_msg_headers = array();
+      $this->cache[$key] = array();
       
       if ($this->get_capability('sort'))
@@ -833 +843 @@
           arsort($a_index);
 
-        $this->cache[$key] = $a_index;
+        $this->cache[$key] = array_keys($a_index);
         }
     }
@@ -849 +859 @@
       {
       $a_index = $this->get_message_cache_index($cache_key, TRUE, $this->sort_field, $this->sort_order);
-      return array_values($a_index);
-      }
-
+      return array_keys($a_index);
+      }
 
     // fetch complete message index
@@ -871 +880 @@
         arsort($a_index);
         
-      $this->cache[$key] = $a_index;
+      $this->cache[$key] = array_keys($a_index);
       }