From 0d82d1d451085283e0843b3b79116e3166a637be Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 23 Mar 2010 08:23:45 +0100 Subject: [PATCH] Only append the domain if the username does not already contain a domain name. Dovecot behaves different than cyrus here. --- .../lib/Horde/Kolab/Storage/Namespace/Element/Other.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 5aa932d5c..e363d669d 100644 --- 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; } -- 2.11.0