gunnar: server/patches/horde-webmail/1.2.0/merges series, NONE, 1.1 t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff, NONE, 1.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv9183/merges

Added Files:
	series 
	t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff 
Log Message:
Provide a merges directory for additional patches not yet available from github.

--- NEW FILE: series ---
t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff

--- NEW FILE: t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff ---
diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
--- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
+++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
@@ -494,9 +494,13 @@
             if (substr($matches[1], 0, 6) == 'INBOX/') {
                 $this->_owner = Auth::getAuth();
             } elseif (substr($matches[1], 0, 5) == 'user/') {
-                $domain = strstr(Auth::getAuth(), '@');
-                $user_domain = isset($matches[4]) ? $matches[4] : $domain;
-                $this->_owner = $matches[2] . $user_domain;
+                if (strpos($matches[2], '@') === FALSE) {
+                    $domain = strstr(Auth::getAuth(), '@');
+                    $user_domain = isset($matches[4]) ? $matches[4] : $domain;
+                    $this->_owner = $matches[2] . $user_domain;
+                } else {
+                    $this->_owner = $matches[2];
+                }
             } elseif ($matches[1] == 'shared.') {
                 $this->_owner =  'anonymous';
             }

Diff finished.  Wed Feb 18 17:55:20 2009