From 0002efbf67a3e53da53e5c7091439508649aab20 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 9 Nov 2010 11:26:06 +0000
Subject: Always select the right mailbox before listing headers

git-svn-id: https://svn.roundcube.net/trunk@4201 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/kolab_addressbook/kolab_addressbook.php    | 2 +-
 plugins/kolab_addressbook/rcube_kolab_contacts.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index da4f56ae7..c20b3dd94 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -65,7 +65,7 @@ class kolab_addressbook extends rcube_plugin
         else {
             foreach ($this->folders as $c_folder) {
                 // create instance of rcube_contacts
-                $abook_id = strtolower(asciiwords(strtr($c_folder->name, '/', '-')));
+                $abook_id = strtolower(asciiwords(strtr($c_folder->name, '/.', '--')));
                 $abook = new rcube_kolab_contacts($c_folder->name);
                 $this->sources[$abook_id] = $abook;
                 
diff --git a/plugins/kolab_addressbook/rcube_kolab_contacts.php b/plugins/kolab_addressbook/rcube_kolab_contacts.php
index f52512d27..d601ae16b 100644
--- a/plugins/kolab_addressbook/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/rcube_kolab_contacts.php
@@ -53,7 +53,6 @@ class rcube_kolab_contacts extends rcube_addressbook
         
         if (in_array($this->imap_folder, $folders)) {
           $this->_imap->set_pagesize(9999);
-          $this->_imap->set_mailbox($this->imap_folder);
           $this->ready = true;
         }
     }
@@ -153,6 +152,7 @@ class rcube_kolab_contacts extends rcube_addressbook
         $xml_list = Horde_Kolab_Format_XML::factory('distributionlist');
       
         $index = 0;
+        $this->_imap->set_mailbox($this->imap_folder);
         $headers = $this->_imap->list_headers();
         foreach ($headers as $header) {
             if ($type = $header->others['x-kolab-type']) {
-- 
cgit v1.2.3