Backporting r5092, r5095, r5096 to release-0.6 branch

release-0.6
thomascube 13 years ago
parent b6cd452bd3
commit d43d4bcf44

@ -3513,6 +3513,10 @@ class rcube_imap
*/ */
function mailbox_info($mailbox) function mailbox_info($mailbox)
{ {
if ($this->icache['options'] && $this->icache['options']['name'] == $mailbox) {
return $this->icache['options'];
}
$acl = $this->get_capability('ACL'); $acl = $this->get_capability('ACL');
$namespace = $this->get_namespace(); $namespace = $this->get_namespace();
$options = array(); $options = array();
@ -3574,6 +3578,8 @@ class rcube_imap
$options['norename'] = $options['is_root'] || $options['namespace'] != 'personal'; $options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
} }
$this->icache['options'] = $options;
return $options; return $options;
} }

@ -55,16 +55,6 @@ else {
} }
} }
// Check access rights to the parent folder
if (!$error && strlen($path)) {
$parent_opts = $RCMAIL->imap->mailbox_info($path);
if ($parent_opts['namespace'] != 'personal'
&& (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts)))
) {
$error = rcube_label('parentnotwritable');
}
}
if ($error) { if ($error) {
$OUTPUT->command('display_message', $error, 'error'); $OUTPUT->command('display_message', $error, 'error');
} }
@ -78,7 +68,19 @@ else {
else { else {
$name_imap = $RCMAIL->imap->mod_mailbox($name_imap, 'in'); $name_imap = $RCMAIL->imap->mod_mailbox($name_imap, 'in');
} }
}
// Check access rights to the parent folder
if (!$error && strlen($path) && (!strlen($old_imap) || $old_imap != $name_imap)) {
$parent_opts = $RCMAIL->imap->mailbox_info($path);
if ($parent_opts['namespace'] != 'personal'
&& (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts)))
) {
$error = rcube_label('parentnotwritable');
}
}
if (!$error) {
$folder['name'] = $name_imap; $folder['name'] = $name_imap;
$folder['oldname'] = $old_imap; $folder['oldname'] = $old_imap;
$folder['class'] = ''; $folder['class'] = '';

@ -287,3 +287,9 @@ table.records-table thead tr td
padding: 0 0 0.5em 0; padding: 0 0 0.5em 0;
margin-left: -4px; margin-left: -4px;
} }
/* fix "jumping" login form in IE7 */
#login-form div.boxcontent
{
overflow: hidden;
}

Loading…
Cancel
Save