Support listing folder types.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php
index fa6f0fd..d2eb68b 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php
@@ -34,4 +34,11 @@ interface Horde_Kolab_Storage_List
      */
     public function listFolders();
 
+    /**
+     * Returns the folder types as associative array.
+     *
+     * @return array The list folder types with the folder names as key and the
+     *               type as values.
+     */
+    public function listTypes();
 }

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Base.php
index 805e4df..43eb0b9 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Base.php
@@ -54,4 +54,17 @@ implements Horde_Kolab_Storage_List
     {
         return $this->_driver->getMailboxes();
     }
+
+    /**
+     * Returns the folder types as associative array.
+     *
+     * @return array The list folder types with the folder names as key and the
+     *               type as values.
+     */
+    public function listTypes()
+    {
+        return $this->_driver->listAnnotation(
+            '/shared/vendor/kolab/folder-type'
+        );
+    }
 }
\ No newline at end of file

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
index cfd77bb..5bcc65b 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
@@ -71,4 +71,20 @@ implements Horde_Kolab_Storage_List
         );
         return $result;
     }
+
+    /**
+     * Returns the folder types as associative array.
+     *
+     * @return array The list folder types with the folder names as key and the
+     *               type as values.
+     */
+    public function listTypes()
+    {
+        $this->_logger->info('Listing folder types.');
+        $result = $this->_list->listTypes();
+        $this->_logger->info(
+            sprintf('List contained %s folders and types.', count($result))
+        );
+        return $result;
+    }
 }
\ No newline at end of file