From e7f6b8d9ce35d78706a8609dd56e8aed44d3a4d4 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Sun, 26 Oct 2014 22:12:29 -0600
Subject: [PATCH] Special mailboxes obviously can't be located on remote
 accounts, so don't show them in preferences

Bug #13648
---
 imp/lib/Prefs/Special/ComposeTemplates.php | 5 ++++-
 imp/lib/Prefs/Special/Drafts.php           | 5 ++++-
 imp/lib/Prefs/Special/Sentmail.php         | 5 ++++-
 imp/lib/Prefs/Special/Spam.php             | 5 ++++-
 imp/lib/Prefs/Special/Trash.php            | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/imp/lib/Prefs/Special/ComposeTemplates.php b/imp/lib/Prefs/Special/ComposeTemplates.php
index b352ced0a61..9854b31ad62 100644
--- a/imp/lib/Prefs/Special/ComposeTemplates.php
+++ b/imp/lib/Prefs/Special/ComposeTemplates.php
@@ -53,7 +53,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator = new IMP_Ftree_IteratorFilter(
             $injector->getInstance('IMP_Ftree')
         );
-        $iterator->add($iterator::NONIMAP);
+        $iterator->add(array(
+            $iterator::NONIMAP,
+            $iterator::REMOTE
+        ));
         $iterator->mboxes = array('INBOX');
 
         $view->mbox_flist = new IMP_Ftree_Select(array(
diff --git a/imp/lib/Prefs/Special/Drafts.php b/imp/lib/Prefs/Special/Drafts.php
index 1d65afaf77e..346104425dd 100644
--- a/imp/lib/Prefs/Special/Drafts.php
+++ b/imp/lib/Prefs/Special/Drafts.php
@@ -47,7 +47,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator = new IMP_Ftree_IteratorFilter(
             $injector->getInstance('IMP_Ftree')
         );
-        $iterator->add($iterator::NONIMAP);
+        $iterator->add(array(
+            $iterator::NONIMAP,
+            $iterator::REMOTE
+        ));
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
diff --git a/imp/lib/Prefs/Special/Sentmail.php b/imp/lib/Prefs/Special/Sentmail.php
index bafb509a760..0f904e3d74f 100644
--- a/imp/lib/Prefs/Special/Sentmail.php
+++ b/imp/lib/Prefs/Special/Sentmail.php
@@ -58,7 +58,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator = new IMP_Ftree_IteratorFilter(
             $injector->getInstance('IMP_Ftree')
         );
-        $iterator->add($iterator::NONIMAP);
+        $iterator->add(array(
+            $iterator::NONIMAP,
+            $iterator::REMOTE
+        ));
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
diff --git a/imp/lib/Prefs/Special/Spam.php b/imp/lib/Prefs/Special/Spam.php
index 0bc3c09928d..c74a4d5646d 100644
--- a/imp/lib/Prefs/Special/Spam.php
+++ b/imp/lib/Prefs/Special/Spam.php
@@ -49,7 +49,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator = new IMP_Ftree_IteratorFilter(
             $injector->getInstance('IMP_Ftree')
         );
-        $iterator->add($iterator::NONIMAP);
+        $iterator->add(array(
+            $iterator::NONIMAP,
+            $iterator::REMOTE
+        ));
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(
diff --git a/imp/lib/Prefs/Special/Trash.php b/imp/lib/Prefs/Special/Trash.php
index d082b7b48f4..21025e2b739 100644
--- a/imp/lib/Prefs/Special/Trash.php
+++ b/imp/lib/Prefs/Special/Trash.php
@@ -52,7 +52,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $iterator = new IMP_Ftree_IteratorFilter(
             $injector->getInstance('IMP_Ftree')
         );
-        $iterator->add($iterator::NONIMAP);
+        $iterator->add(array(
+            $iterator::NONIMAP,
+            $iterator::REMOTE
+        ));
         $iterator->mboxes = array('INBOX');
 
         $view->flist = new IMP_Ftree_Select(array(