#13209: Fix remote name in sent-mail list

horde · Jun 9, 2014 · 1c3098f · 1c3098f
1 parent 2fa2f97
commit 1c3098f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/imp/lib/Ftree/Element.php b/imp/lib/Ftree/Element.php
@@ -124,6 +124,11 @@ public function __get($name)
             while ($elt = $elt->parent) {
                 if ($elt->namespace) {
                     return $i + 1;
+                } elseif ($elt->remote) {
+                    if ($this->remote_mbox) {
+                        ++$i;
+                    }
+                    return $i + 1;
                 }
             }
 

diff --git a/imp/lib/Ftree/IteratorFilter/Nonimap.php b/imp/lib/Ftree/IteratorFilter/Nonimap.php
@@ -28,7 +28,8 @@ public function accept()
     {
         $curr = $this->current();
 
-        return (!$curr->nonimap || ($curr->namespace && $curr->children));
+        return (!$curr->nonimap ||
+                (($curr->remote || $curr->namespace) && $curr->children));
     }
 
 }
diff --git a/imp/lib/Mailbox.php b/imp/lib/Mailbox.php
@@ -349,9 +349,13 @@ public function __get($key)
                 return $this->label;
             }
 
-            return (($pos = strrpos($this->_mbox, $this->namespace_delimiter)) === false)
-                ? strval($this)
-                : substr($this->_mbox, $pos + 1);
+            $mbox = $this->remote_mbox
+                ? $this->label
+                : $this->_mbox;
+
+            return (($pos = strrpos($mbox, $this->namespace_delimiter)) === false)
+                ? strval($mbox)
+                : substr($mbox, $pos + 1);
 
         case 'cacheid':
         case 'cacheid_date':