Changeset b866a27 in github

Timestamp:

Jun 28, 2012 4:43:50 AM (11 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

master, HEAD

Children:

d901205

Parents:

a60d139

Message:

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).

Files:

• plugins/acl/acl.php (modified) (2 diffs)
• plugins/acl/package.xml (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)

plugins/acl/acl.php

@@ -129 +129 @@
     function folder_form($args)
     {
+        $mbox_imap = $args['options']['name'];
+        $myrights  = $args['options']['rights'];
+
         // Edited folder name (empty in create-folder mode)
-        $mbox_imap = $args['options']['name'];
         if (!strlen($mbox_imap)) {
             return $args;
@@ -140 +142 @@
         }
 */
-        // Namespace root
-        if ($args['options']['is_root']) {
-            return $args;
-        }
-
         // Get MYRIGHTS
-        if (!($myrights = $args['options']['rights'])) {
-            return $args;
-        }
-
-        // Do nothing if no ACL support
-        if (!$this->rc->storage->get_capability('ACL')) {
+        if (empty($myrights)) {
             return $args;
         }

plugins/acl/package.xml

@@ -14 +14 @@
                 <active>yes</active>
         </lead>
-        <date>2012-03-13</date>
+        <date>2012-06-28</date>
         <version>
-                <release>0.8</release>
+                <release>0.9</release>
                 <api>0.7</api>
         </version>

program/include/rcube_imap.php

@@ -3230 +3230 @@
         $cached = $this->get_cache($cache_key);
 
-        if (is_array($cached))
+        if (is_array($cached)) {
             return $cached;
+        }
 
         $acl       = $this->get_capability('ACL');
@@ -3268 +3269 @@
         $options['attributes'] = $this->folder_attributes($folder, true);
         $options['namespace']  = $this->folder_namespace($folder);
-        $options['rights']     = $acl && !$options['is_root'] ? (array)$this->my_rights($folder) : array();
         $options['special']    = in_array($folder, $this->default_folders);
 
-        // Set 'noselect' and 'norename' flags
+        // Set 'noselect' flag
         if (is_array($options['attributes'])) {
             foreach ($options['attributes'] as $attrib) {
@@ -3284 +3284 @@
         }
 
+        // Get folder rights (MYRIGHTS)
+        if ($acl && !$options['noselect']) {
+            // skip shared roots
+            if (!$options['is_root'] || $options['namespace'] == 'personal') {
+                $options['rights'] =  (array)$this->my_rights($folder);
+            }
+        }
+
+        // Set 'norename' flag
         if (!empty($options['rights'])) {
             $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);