Improve checking folder delete rights according to RFC 4314

6 years ago · fd7d7faabd
parent 728e5c6cc4
commit fd7d7faabd
1 changed files with 4 additions and 2 deletions
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@ -3770,7 +3770,9 @@ class rcube_imap extends rcube_storage

        // Set 'norename' flag
        if (!empty($options['rights'])) {
-            $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);
+            $rfc_4314 = is_array($this->get_capability('RIGHTS'));
+            $options['norename'] = ($rfc_4314 && !in_array('x', $options['rights']))
+                                || (!$rfc_4314 && !in_array('d', $options['rights']));

            if (!$options['noselect']) {
                $options['noselect'] = !in_array('r', $options['rights']);