More thorough nonimap filter selection

Children might be unviewable, so need to do a recursive search for at least one visible nonimap child
horde · Jul 1, 2014 · e8002ba · e8002ba
1 parent 057ccdc
commit e8002ba
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/imp/lib/Ftree/IteratorFilter/Nonimap.php b/imp/lib/Ftree/IteratorFilter/Nonimap.php
@@ -28,8 +28,25 @@ public function accept()
     {
         $curr = $this->current();
 
-        return (!$curr->nonimap ||
-                (($curr->remote || $curr->namespace) && $curr->children));
+        if (!$curr->nonimap) {
+            return true;
+        }
+
+        if (($curr->remote || $curr->namespace) && $curr->children) {
+            $iterator = new IMP_Ftree_IteratorFilter(
+                new IMP_Ftree_Iterator($curr)
+            );
+            $iterator->add(array(
+                $iterator::CONTAINERS,
+                $iterator::NONIMAP
+            ));
+
+            foreach ($iterator as $val) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
 }