From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 15 Mar 2010 08:30:02 +0000 (+0100)
Subject: Test creating folders in non-personal namespaces (deprecated).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=82b9813b8234ed5de84c04cc686b601b1b741d82;p=horde.git

Test creating folders in non-personal namespaces (deprecated).
---

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
index cb7941a84..56ee6ca24 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
@@ -190,8 +190,8 @@ class Horde_Kolab_Storage_Namespace
         $namespace = $this->matchNamespace($name);
         $path = explode(':', $name);
         if (empty($this->_sharedPrefix)
-            || strpos($path[0], $this->_sharedPrefix) === false
-            || in_array($path[0], array_keys($this->_namespaces[self::OTHER]))) {
+            || (strpos($path[0], $this->_sharedPrefix) === false
+                && !in_array($path[0], array_keys($this->_namespaces[self::OTHER])))) {
             $namespace = $this->_getPrimaryPersonalNamespace();
             array_unshift($path, $namespace['namespace']);
         } else {
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
index a25696109..9922c2e00 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
@@ -158,6 +158,22 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    public function testSetnameAllowsCreatingFoldersInSharedNamespace()
+    {
+        $folder = new Horde_Kolab_Storage_Folder(null);
+        $folder->restore($this->_storage, $this->_connection, new Horde_Kolab_Storage_Namespace());
+        $folder->setName('shared.test');
+        $this->assertEquals('shared.test', $folder->getName());
+    }
+
+    public function testSetnameAllowsCreatingFoldersInOthersNamespace()
+    {
+        $folder = new Horde_Kolab_Storage_Folder(null);
+        $folder->restore($this->_storage, $this->_connection, new Horde_Kolab_Storage_Namespace());
+        $folder->setName('user:test:test');
+        $this->assertEquals('user/test/test', $folder->getName());
+    }
+
     public function testFolderSubpathIsAccessibleForNewFolders()
     {
         $folder = new Horde_Kolab_Storage_Folder(null);