From f57f2910da9b71a57de62ba5cd6f5a4c3f9c4e41 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 23 Mar 2010 07:21:34 +0100 Subject: [PATCH] IMAP provides the namespace including the delimiter. --- .../lib/Horde/Kolab/Storage/Namespace/Element.php | 3 +++ .../Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php | 4 ++-- .../Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php | 10 +++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php index 1bbba5ab2..ab72ec56d 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php @@ -24,6 +24,9 @@ abstract class Horde_Kolab_Storage_Namespace_Element */ public function __construct($name, $delimiter) { + if (substr($name, -1) == $delimiter) { + $name = substr($name, 0, -1); + } $this->_name = $name; $this->_delimiter = $delimiter; } diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php index 6867d87b5..3b170b804 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php @@ -45,8 +45,8 @@ extends Horde_Kolab_Storage_Namespace { parent::__construct(); - $personal = new Horde_Kolab_Storage_Namespace_Element_Personal('INBOX', '/'); - $other = new Horde_Kolab_Storage_Namespace_Element_Other('user', '/'); + $personal = new Horde_Kolab_Storage_Namespace_Element_Personal('INBOX/', '/'); + $other = new Horde_Kolab_Storage_Namespace_Element_Other('user/', '/'); $shared = new Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix('', '/', 'shared.'); $this->_namespaces = array($personal, $other); diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php index c3b23ed1a..38b2efcdf 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php @@ -272,13 +272,13 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase array( array( 'type' => Horde_Kolab_Storage_Namespace::PERSONAL, - 'name' => 'INBOX', + 'name' => 'INBOX/', 'delimiter' => '/', 'add' => true, ), array( 'type' => Horde_Kolab_Storage_Namespace::OTHER, - 'name' => 'user', + 'name' => 'user/', 'delimiter' => '/', ), array( @@ -292,12 +292,12 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase new Horde_Kolab_Storage_Namespace_Imap( array( array( - 'name' => 'INBOX', + 'name' => 'INBOX/', 'type' => Horde_Kolab_Storage_Namespace::PERSONAL, 'delimiter' => '/', ), array( - 'name' => 'user', + 'name' => 'user/', 'type' => Horde_Kolab_Storage_Namespace::OTHER, 'delimiter' => '/', ), @@ -308,7 +308,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase ), ), array( - 'INBOX' => array( + 'INBOX/' => array( 'add' => true, ), '' => array( -- 2.11.0