Permalink
Browse files

Backporting r5092, r5095, r5096 to release-0.6 branch

  • Loading branch information...
1 parent b6cd452 commit d43d4bcf44a1feae4274e51f41ce9625147f9f85 @thomascube thomascube committed Aug 19, 2011
Showing with 24 additions and 10 deletions.
  1. +6 −0 program/include/rcube_imap.php
  2. +12 −10 program/steps/settings/save_folder.inc
  3. +6 −0 skins/default/iehacks.css
@@ -3513,6 +3513,10 @@ function mailbox_options($mailbox, $force=false)
*/
function mailbox_info($mailbox)
{
+ if ($this->icache['options'] && $this->icache['options']['name'] == $mailbox) {
+ return $this->icache['options'];
+ }
+
$acl = $this->get_capability('ACL');
$namespace = $this->get_namespace();
$options = array();
@@ -3574,6 +3578,8 @@ function mailbox_info($mailbox)
$options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
}
+ $this->icache['options'] = $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) {
$OUTPUT->command('display_message', $error, 'error');
}
@@ -78,7 +68,19 @@ else {
else {
$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['oldname'] = $old_imap;
$folder['class'] = '';
@@ -287,3 +287,9 @@ table.records-table thead tr td
padding: 0 0 0.5em 0;
margin-left: -4px;
}
+
+/* fix "jumping" login form in IE7 */
+#login-form div.boxcontent
+{
+ overflow: hidden;
+}

0 comments on commit d43d4bc

Please sign in to comment.