Changeset 4988 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Jul 29, 2011 7:53:35 AM (23 months ago)

Author:

alec

Message:

• Fix 'exceptions' parameter of rcmail_mailbox_select() to handle directories on any level of the structure

File:

• trunk/roundcubemail/program/include/main.inc (modified) (3 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -1230 +1230 @@
     $select->add($p['noselection'], '');
 
-  rcmail_render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames']);
+  rcmail_render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames'], 0, $p['exceptions']);
 
   return $select;
@@ -1403 +1403 @@
  * @return string
  */
-function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames=false, $nestLevel=0)
+function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames=false, $nestLevel=0, $exceptions=array())
 {
   $out = '';
 
-  foreach ($arrFolders as $key=>$folder) {
+  foreach ($arrFolders as $key => $folder) {
+    if (!empty($exceptions) && in_array($folder['id'], $exceptions)) {
+      continue;
+    }
+
     if (!$realnames && ($folder_class = rcmail_folder_classname($folder['id'])))
       $foldername = rcube_label($folder_class);
@@ -1421 +1425 @@
 
     if (!empty($folder['folders']))
-      $out .= rcmail_render_folder_tree_select($folder['folders'], $mbox_name, $maxlength, $select, $realnames, $nestLevel+1);
+      $out .= rcmail_render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
+        $select, $realnames, $nestLevel+1, $exceptions);
   }