summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-04-18 17:50:46 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2012-04-18 17:50:46 (GMT)
commit3aab9325f173964e376016ec20459a177d77ff7a (patch)
treee81074798f15313d9e5ba72d61f25121e103b2e2
parentbda8aa02b6f62c95d483e9e75b2b65ee41cb7a7f (diff)
downloadroundcubemail-plugins-kolab-3aab9325f173964e376016ec20459a177d77ff7a.tar.gz
Fix parent folder permissions checking. See http://trac.roundcube.net/ticket/1488443
-rw-r--r--plugins/calendar/drivers/kolab/kolab_driver.php2
-rw-r--r--plugins/kolab_addressbook/kolab_addressbook.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index a55a8cc..763dbba 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -294,7 +294,7 @@ class kolab_driver extends calendar_driver
$this->rc->imap_connect();
$parent_opts = $this->rc->imap->mailbox_info($parent);
if ($parent_opts['namespace'] != 'personal'
- && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts)))
+ && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))
) {
$this->last_error = 'No permission to create folder';
return false;
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index ec75162..f33a037 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -467,7 +467,7 @@ class kolab_addressbook extends rcube_plugin
$this->rc->imap_connect();
$parent_opts = $this->rc->imap->mailbox_info($path);
if ($parent_opts['namespace'] != 'personal'
- && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts)))
+ && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))
) {
$error = rcube_label('parentnotwritable');
}