Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-23 08:16:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve checking folder delete rights according to RFC 4314

Browse Source
This commit is contained in:
Aleksander Machniak
2018-06-12 09:48:12 +02:00
parent 728e5c6cc4
commit fd7d7faabd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
program/lib/Roundcube/rcube_imap.php
View File

@@ -3707,7 +3707,7 @@ class rcube_imap extends rcube_storage
// get cached metadata
$cache_key = 'mailboxes.folder-info.' . $folder;
$cached = $this->get_cache($cache_key);
$cached = $this->get_cache($cache_key);
if (is_array($cached)) {
return $cached;
@@ -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']);