Changeset 5022 in subversion

Timestamp:

Aug 4, 2011 5:01:36 AM (22 months ago)

Author:

alec

Message:

• Add ACL check on parent folder

Location:

trunk/roundcubemail/program

Files:

• localization/en_US/messages.inc (modified) (1 diff)
• steps/settings/edit_folder.inc (modified) (1 diff)
• steps/settings/save_folder.inc (modified) (1 diff)

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -151 +151 @@
 $messages['invalidimageformat'] = 'Not a valid image format.';
 $messages['mispellingsfound'] = 'Spelling errors detected in the message.';
+$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
 
 ?>

trunk/roundcubemail/program/steps/settings/edit_folder.inc

@@ -256 +256 @@
         }
 
-        if ($content) {        
+        if ($content) {
             $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
         }

trunk/roundcubemail/program/steps/settings/save_folder.inc

@@ -53 +53 @@
             break;
         }
+    }
+}
+
+// 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');
     }
 }