Test and fix domain handling.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index 92cbc0f..d06be64 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -501,7 +501,7 @@ class Horde_Kolab_Storage_Folder
                 if (strpos($user, '@') === false) {
                     $domain = strstr(Horde_Auth::getAuth(), '@');
                     if (!empty($domain)) {
-                        $user .= '@' . $domain;
+                        $user .= $domain;
                     }
                 }
                 $this->_owner = $user;

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
index 56ee6ca..8442e4e 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
@@ -155,7 +155,7 @@ class Horde_Kolab_Storage_Namespace
             $user = $path[1];
             $domain = strstr(array_pop($path), '@');
             if (!empty($domain)) {
-                $user .= '@' . $domain;
+                $user .= $domain;
             }
             return self::OTHER . ':' . $user;
         }

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
index 9922c2e..5a24eed 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
@@ -130,6 +130,21 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('test', $folder->getOwner());
     }
 
+    public function testFolderOwnerHasDomainFromFolderDomain()
+    {
+        $_SESSION['horde_auth']['userId'] = 'test@example.com';
+        $folder = new Horde_Kolab_Storage_Folder('user/test/mine');
+        $folder->restore($this->_storage, $this->_connection, new Horde_Kolab_Storage_Namespace());
+        $this->assertEquals('test@example.com', $folder->getOwner());
+    }
+
+    public function testFolderOwnerHasDomainFromCurrentUserIfNoFolderDomain()
+    {
+        $folder = new Horde_Kolab_Storage_Folder('user/test/mine@example.com');
+        $folder->restore($this->_storage, $this->_connection, new Horde_Kolab_Storage_Namespace());
+        $this->assertEquals('test@example.com', $folder->getOwner());
+    }
+
     public function testSetnameDoesAddDefaultPersonalNamespace()
     {
         $folder = new Horde_Kolab_Storage_Folder(null);