Only append the domain if the username does not already contain a domain name. Doveco...

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
index 5aa932d..e363d66 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
@@ -24,9 +24,11 @@ extends Horde_Kolab_Storage_Namespace_Element
     {
         $path = explode($this->_delimiter, $name);
         $user = $path[1];
-        $domain = strstr(array_pop($path), '@');
-        if (!empty($domain)) {
-            $user .= $domain;
+        if (strpos($user, '@') === false) {
+            $domain = strstr(array_pop($path), '@');
+            if (!empty($domain)) {
+                $user .= $domain;
+            }
         }
         return Horde_Kolab_Storage_Namespace::OTHER . ':' . $user;
     }