wilde: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.28, 1.29
cvs at kolab.org
cvs at kolab.org
Wed Feb 18 18:56:44 CET 2009
Author: wilde
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv5377/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
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 ...
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- horde-webmail-1.2.0_kolab_openpkg.patch 9 Feb 2009 14:33:46 -0000 1.28
+++ horde-webmail-1.2.0_kolab_openpkg.patch 18 Feb 2009 17:56:41 -0000 1.29
@@ -18860,3 +18860,25 @@
if ($this->_msgs) {
--
tg: (667dce6..) t/dimp/HK/GW/ItipHandling (depends on: master t/dimp/H/MS/FixBrokenFolderImages)
+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
More information about the commits
mailing list