Make container display be the default

diff --git a/imp/folders-mimp.php b/imp/folders-mimp.php
index c8dc0d4..98c9088 100644 (file)
--- a/imp/folders-mimp.php
+++ b/imp/folders-mimp.php
@@ -33,7 +33,7 @@ $showAll = (!$subscribe || $_SESSION['imp']['showunsub']);
 
 /* Initialize the IMP_Imap_Tree object. */
 $imptree = $injector->getInstance('IMP_Imap_Tree');
-$mask = IMP_Imap_Tree::FLIST_CONTAINER;
+$mask = 0;
 
 /* Toggle subscribed view, if necessary. */
 if ($subscribe && Horde_Util::getFormData('ts')) {

diff --git a/imp/folders.php b/imp/folders.php
index 6364f60..e4aaee1 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -396,9 +396,9 @@ $a_template->set('expand_all', Horde::widget($folders_url_ob->copy()->add(array(
 $a_template->set('collapse_all', Horde::widget($folders_url_ob->copy()->add(array('actionID' => 'collapse_all_folders', 'folders_token' => $folders_token)), _("Collapse All Folders"), 'widget', '', '', _("Collapse All"), true));
 
 /* Build the folder tree. */
-// TODO: Javascript JSON loading; save expanded view.
-//$imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER | IMP_Imap_Tree::FLIST_VFOLDER | IMP_Imap_Tree::FLIST_EXPANDED);
-$imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER | IMP_Imap_Tree::FLIST_VFOLDER);
+// TODO: Javascript JSON loading
+//$imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_VFOLDER | IMP_Imap_Tree::FLIST_EXPANDED);
+$imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_VFOLDER);
 
 $tree = $imaptree->createTree('imp_folders', array(
     'checkbox' => true,

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index 88e8407..82e4841 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -285,7 +285,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
         $initreload = ($this->_vars->initial || $this->_vars->reload);
         $result = new stdClass;
 
-        $mask = IMP_Imap_Tree::FLIST_CONTAINER | IMP_Imap_Tree::FLIST_VFOLDER;
+        $mask = IMP_Imap_Tree::FLIST_VFOLDER;
         if ($this->_vars->unsub) {
             $mask |= IMP_Imap_Tree::FLIST_UNSUB;
         }

diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index 57894c8..78744df 100644 (file)
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -62,7 +62,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
 
         /* Initialize the IMP_Tree object. */
         $imaptree = $injector->getInstance('IMP_Imap_Tree');
-        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER | IMP_Imap_Tree::FLIST_VFOLDER);
+        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_VFOLDER);
         $imaptree->createTree($tree, array(
             'indent' => $indent,
             'parent' => $parent,

diff --git a/imp/lib/Folder.php b/imp/lib/Folder.php
index fddf925..96c5780 100644 (file)
--- a/imp/lib/Folder.php
+++ b/imp/lib/Folder.php
@@ -219,7 +219,7 @@ class IMP_Folder
         $inserted = array($new);
 
         $imaptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree');
-        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_UNSUB, $old);
+        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_NOCONTAINER | IMP_Imap_Tree::FLIST_UNSUB, $old);
 
         /* Get list of any folders that are underneath this one. */
         $all_folders = array_merge(array($old), array_keys(iterator_to_array($imaptree)));

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 7ecb4d6..b31176f 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -192,10 +192,7 @@ class IMP
      */
     static public function flistSelect($options = array())
     {
-        $imaptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree');
-        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER);
-
-        $tree = $imaptree->createTree('imp_flist_select', array(
+        $tree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree')->createTree('imp_flist_select', array(
             'render_type' => 'IMP_Tree_Flist'
         ));
         if (!empty($options['selected'])) {

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index 5d4a9cc..4e6d96e 100644 (file)
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -38,7 +38,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator
     const OPEN_USER = 2;
 
     /* The folder list filtering constants. */
-    const FLIST_CONTAINER = 1;
+    const FLIST_NOCONTAINER = 1;
     const FLIST_UNSUB = 2;
     const FLIST_VFOLDER = 4;
     const FLIST_NOCHILDREN = 8;
@@ -1734,7 +1734,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator
      *
      * @param integer $mask  A mask with the following possible elements:
      * <pre>
-     * IMP_Imap_Tree::FLIST_CONTAINER - Include container elements.
+     * IMP_Imap_Tree::FLIST_NOCONTAINER - Don't include container elements.
      * IMP_Imap_Tree::FLIST_UNSUB - Include unsubscribed elements.
      * IMP_Imap_Tree::FLIST_VFOLDER - Include Virtual Folders.
      * IMP_Imap_Tree::FLIST_NOCHILDREN - Don't include child elements.
@@ -1804,7 +1804,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator
             /* Checks done when determining whether to mark current element as
              * valid. */
             if ($elt->container) {
-                if (!($c['mask'] & self::FLIST_CONTAINER) ||
+                if (($c['mask'] & self::FLIST_NOCONTAINER) ||
                     !$elt->children) {
                     return false;
                 }

diff --git a/imp/lib/Imap/Tree/Element.php b/imp/lib/Imap/Tree/Element.php
index 129f1dd..0ccea9f 100644 (file)
--- a/imp/lib/Imap/Tree/Element.php
+++ b/imp/lib/Imap/Tree/Element.php
@@ -212,7 +212,7 @@ class IMP_Imap_Tree_Element
     /**
      * Return icon information.
      *
-     * TODO
+     * @return stdClass  TODO
      */
     protected function _getIcon()
     {

diff --git a/imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php b/imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php
index 67f8bd1..4c2b8e1 100644 (file)
--- a/imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php
+++ b/imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php
@@ -38,9 +38,11 @@ class IMP_LoginTasks_Task_DeleteSentmailMonthly extends Horde_LoginTasks_Task
            the date. */
         $identity = $GLOBALS['injector']->getInstance('IMP_Identity');
         $imp_folder = $GLOBALS['injector']->getInstance('IMP_Folder');
-        $imaptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree');
         $sent_mail_folders = $identity->getAllSentmailFolders();
 
+        $imaptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree');
+        $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_NOCONTAINER);
+
         $folder_array = array();
 
         foreach ($imaptree as $k => $v) {

diff --git a/imp/lib/Views/Compose.php b/imp/lib/Views/Compose.php
index 71eda38..308db69 100644 (file)
--- a/imp/lib/Views/Compose.php
+++ b/imp/lib/Views/Compose.php
@@ -96,10 +96,9 @@ class IMP_Views_Compose
                     }
                 }
 
+                $flist = array();
                 $imaptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree');
-                $imaptree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER);
 
-                $flist = array();
                 foreach ($imaptree as $val) {
                     $tmp = array(
                         'f' => $val->display,

diff --git a/imp/search.php b/imp/search.php
index bc8166e..70911f5 100644 (file)
--- a/imp/search.php
+++ b/imp/search.php
@@ -86,9 +86,7 @@ if ($vars->criteria_form) {
 }
 
 /* Generate master folder list. */
-$imp_imap_tree = $injector->getInstance('IMP_Imap_Tree');
-$imp_imap_tree->setIteratorFilter(IMP_Imap_Tree::FLIST_CONTAINER);
-$tree = $imp_imap_tree->createTree('imp_search', array(
+$tree = $injector->getInstance('IMP_Imap_Tree')->createTree('imp_search', array(
     'checkbox' => true,
 ));