Changeset 5102 in subversion

Timestamp:

Aug 19, 2011 12:32:38 PM (21 months ago)

Author:

thomasb

Message:

Backporting r5092, r5095, r5096 to release-0.6 branch

Location:

branches/release-0.6

Files:

• program/include/rcube_imap.php (modified) (2 diffs)
• program/steps/settings/save_folder.inc (modified) (2 diffs)
• skins/default/iehacks.css (modified) (1 diff)

branches/release-0.6/program/include/rcube_imap.php

@@ -3514 +3514 @@
     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();
@@ -3574 +3578 @@
             $options['norename'] = $options['is_root'] || $options['namespace'] != 'personal';
         }
+
+        $this->icache['options'] = $options;
 
         return $options;

branches/release-0.6/program/steps/settings/save_folder.inc

@@ -56 +56 @@
 }
 
-// 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');
@@ -79 +69 @@
         $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;

branches/release-0.6/skins/default/iehacks.css

@@ -288 +288 @@
         margin-left: -4px;
 }
+
+/* fix "jumping" login form in IE7 */
+#login-form div.boxcontent
+{
+  overflow: hidden;
+}