From 9899abc36caf00ed2a054b309607aa868e314e07 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 28 Jun 2012 10:43:50 +0200 Subject: Fix handling of MYRIGHTS on private namespace roots - fixes issue where in ACL plugin it wasn't possible to share INBOX folder (when it was a namespace prefix). Conflicts: program/include/rcube_imap.php Conflicts: plugins/acl/acl.php plugins/acl/package.xml program/include/rcube_imap.php --- program/include/rcube_imap.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'program/include/rcube_imap.php') diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index ed84845c4..f06a8ee70 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -3653,7 +3653,7 @@ class rcube_imap $options['rights'] = $acl && !$options['is_root'] ? (array)$this->my_rights($mailbox) : array(); $options['special'] = in_array($mailbox, $this->default_folders); - // Set 'noselect' and 'norename' flags + // Set 'noselect' flag if (is_array($options['attributes'])) { foreach ($options['attributes'] as $attrib) { $attrib = strtolower($attrib); @@ -3666,6 +3666,15 @@ class rcube_imap $options['noselect'] = true; } + // Get folder rights (MYRIGHTS) + if ($acl && !$options['noselect']) { + // skip shared roots + if (!$options['is_root'] || $options['namespace'] == 'personal') { + $options['rights'] = (array)$this->my_rights($mailbox); + } + } + + // Set 'norename' flag if (!empty($options['rights'])) { $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']); -- cgit v1.2.3