gunnar: server/php-kolab/Kolab_Storage t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch, NONE, 1.1 Kolab_Storage.spec, 1.10, 1.11

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv7583/php-kolab/Kolab_Storage

Modified Files:
	Kolab_Storage.spec 
Added Files:
	t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch 
Log Message:
Moved t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.diff from the patches directory into Kolab_Storage.

--- NEW FILE: t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch ---
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: Kolab_Storage.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Kolab_Storage.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Kolab_Storage.spec	26 Apr 2009 10:33:41 -0000	1.10
+++ Kolab_Storage.spec	26 Apr 2009 11:47:48 -0000	1.11
@@ -21,6 +21,7 @@
 # List of patches
 Patch0:    Kolab_Storage_0.4.0_p1.patch
 Patch1:    Kolab_Storage_0.4.0_p2.patch
+Patch2:    t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -57,6 +58,7 @@
 
         %patch -p0 -P 0
         %patch -p0 -P 1
+        %patch -p2 -P 2
 
 	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml