From 1cd36267a19a2b0accda66827dbdc05ec5ec77be Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 01 Aug 2011 03:58:30 -0400
Subject: [PATCH] - Improved detection of folder rename possibility and its handling
---
program/include/rcube_imap.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index f809288..3ba0589 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3535,6 +3535,7 @@
$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
if (is_array($options['options'])) {
foreach ($options['options'] as $opt) {
$opt = strtolower($opt);
@@ -3548,12 +3549,14 @@
}
if (!empty($options['rights'])) {
- $options['norename'] = !in_array('x', $options['rights']) &&
- (!in_array('c', $options['rights']) || !in_array('d', $options['rights']));
+ $options['norename'] = !in_array('x', $options['rights']);
if (!$options['noselect']) {
$options['noselect'] = !in_array('r', $options['rights']);
}
}
+ else {
+ $options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
+ }
return $options;
}
--
Gitblit v1.9.1