wilde: server/patches/horde-webmail/1.2.0/tg t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff, NONE, 1.1 series, 1.3, 1.4

[cvs at kolab.org]

Author: wilde

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

Modified Files:
	series 
Added Files:
	t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff 
Log Message:
Fix owner of shared user folders for dovecot in kolab-webclient.
Summary: while cyrus imapd uses /user/localpart/mailbox to reference
other users folders dovecot uses /user/localpart at domain/mailbox, which
made horde to build a owner of the form localpart at domain@domain ...


--- 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

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/series,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- series	9 Feb 2009 10:01:57 -0000	1.3
+++ series	18 Feb 2009 17:56:41 -0000	1.4
@@ -62,3 +62,4 @@
 t_horde_SC_CH_SecIssues20090128.diff -p1
 t_dimp_H_MS_FixBrokenFolderImages.diff -p1
 t_dimp_HK_GW_ItipHandling.diff -p1
+t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff -p1