summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2015-02-04 10:41:47 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2015-02-04 10:41:47 (GMT)
commit2c9c463e8420f786db1e0dd84cbcc5ae7f553b64 (patch)
tree6cf3b081557f477427935128eaae48eabf587a02
parente97b087f794e1230c46e6e63bd8aeff67565f85c (diff)
downloadroundcubemail-plugins-kolab-2c9c463e8420f786db1e0dd84cbcc5ae7f553b64.tar.gz
Add optional $type argument in kolab_storage::get_folder()
-rw-r--r--plugins/libkolab/lib/kolab_storage.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 1570b0d..47c1e4b 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -144,7 +144,6 @@ class kolab_storage
return self::$ldap;
}
-
/**
* Get a list of storage folders for the given data type
*
@@ -183,19 +182,19 @@ class kolab_storage
return null;
}
-
/**
* Getter for a specific storage folder
*
- * @param string IMAP folder to access (UTF7-IMAP)
+ * @param string IMAP folder to access (UTF7-IMAP)
+ * @param string Expected folder type
+ *
* @return object kolab_storage_folder The folder object
*/
- public static function get_folder($folder)
+ public static function get_folder($folder, $type = null)
{
- return self::setup() ? new kolab_storage_folder($folder) : null;
+ return self::setup() ? new kolab_storage_folder($folder, $type) : null;
}
-
/**
* Getter for a single Kolab object, identified by its UID.
* This will search all folders storing objects of the given type.