Remove nav_expanded_sidebar preference.

It is mostly duplicative of nav_expanded and doesn't relate well to
either the mimp or dimp views.

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 8bbb8d1..a17d91f 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -1267,7 +1267,7 @@ $prefGroups['folderdisplay'] = array(
     'label' => _("Folder Display Options"),
     'desc' => _("Change folder navigation display options."),
     'members' => array(
-        'nav_expanded', 'tree_view', 'nav_expanded_sidebar', 'nav_poll_all'
+        'nav_expanded', 'tree_view', 'nav_poll_all'
     )
 );
 
@@ -1293,18 +1293,6 @@ $_prefs['tree_view'] = array(
     'desc' => _("How should namespaces be displayed in the folder tree view?")
 );
 
-// expand folder tree by default in sidebar
-$_prefs['nav_expanded_sidebar'] = array(
-    'value' => 0,
-    'type' => 'enum',
-    'enum' => array(
-        0 => _("No"),
-        1 => _("Yes"),
-        2 => _("Current expanded status in the folders view")
-    ),
-    'desc' => _("Expand the entire folder tree by default in the sidebar?")
-);
-
 // poll all folders for new mail?
 $_prefs['nav_poll_all'] = array(
     'value' => 0,

diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index 405e3fd..c17e39b 100644 (file)
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -66,12 +66,12 @@ your ``config/prefs.php`` file and your preferences backend::
    attachment_display
    filter_on_sidebar
    forward_bodytext
+   nav_expanded_sidebar
 
 
 Hooks
 -----
 
-
 * hooks.php has changed
 
 The following hooks have been renamed:

diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index 30ee00f..3cf1c16 100644 (file)
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -83,7 +83,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
             );
             $tree->addNode($parent . $val['value'],
                            ($val['level']) ? $parent . $val['parent'] : $parent,
-                           $label, $indent + $val['level'], $imaptree->isOpenSidebar($val['value']), $node_params);
+                           $label, $indent + $val['level'], $imaptree->isOpen($val['value']), $node_params);
         }
 
         /* We want to rewrite the parent node of the INBOX to include new mail
@@ -109,7 +109,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
                 $node_params['icondir'] = $image_dir;
                 $name = sprintf('<strong>%s</strong> (%s)', $name, $unseen);
             }
-            $tree->addNode($parent, $menu_parent, $name, $indent - 1, $imaptree->isOpenSidebar($parent), $node_params);
+            $tree->addNode($parent, $menu_parent, $name, $indent - 1, $imaptree->isOpen($parent), $node_params);
         }
     }
 

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index c2bcc12..91dc170 100644 (file)
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -1757,32 +1757,6 @@ class IMP_Imap_Tree
     }
 
     /**
-     * Is the mailbox open in the sidebar?
-     *
-     * @param array $mbox  A mailbox name.
-     *
-     * @return integer  True if the mailbox is open in the sidebar.
-     */
-    public function isOpenSidebar($mbox)
-    {
-        switch ($GLOBALS['prefs']->getValue('nav_expanded_sidebar')) {
-        case self::OPEN_USER:
-            $this->_initExpandedList();
-            return !empty($this->_expanded[$mbox]);
-            break;
-
-        case self::OPEN_ALL:
-            return true;
-            break;
-
-        case self::OPEN_NONE:
-        default:
-            return false;
-            break;
-        }
-    }
-
-    /**
      * Init frequently used element() data.
      */
     protected function _initElement()

diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 7a4c927..719a9c1 100644 (file)
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -114,7 +114,6 @@ class IMP_Prefs_Ui
             if ($pop3) {
                 $ui->suppress[] = 'nav_expanded';
                 $ui->suppress[] = 'tree_view';
-                $ui->suppress[] = 'nav_expanded_sidebar';
             }
             break;