summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-04-06 13:59:22 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-04-06 13:59:22 (GMT)
commitf4526a10adb576a2ec18e17ed081a60a1aebc973 (patch)
tree7a8c9d4f7ae44f689cf7162f2513ceaabee76e7c
parentac2f57666eec83a6fa7e71c8be51ea86df9c4bb4 (diff)
downloadserver-f4526a10adb576a2ec18e17ed081a60a1aebc973.tar.gz
kolab/issue3537 (Allowing xfb access to groups does not work)
-rw-r--r--php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec4
-rw-r--r--php-kolab/Kolab_Freebusy/Makefile2
-rw-r--r--php-kolab/Kolab_Freebusy/issue3537.patch33
-rw-r--r--release-notes.txt1
4 files changed, 38 insertions, 2 deletions
diff --git a/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec b/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
index 59549df..4384c19 100644
--- a/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
+++ b/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_FreeBusy
%define V_version 0.1.2
-%define V_release 20090320
+%define V_release 20090406
# Package Information
Name: %{V_package}
@@ -22,6 +22,7 @@ Source1: package.xml
Patch0: kolab_issue3313.patch
Patch1: issue3438.patch
Patch2: issue3450.patch
+Patch3: issue3537.patch
# Build Info
Prefix: %{l_prefix}
@@ -57,6 +58,7 @@ for a particular user.
%patch -p1 -P 0
%patch -p3 -P 1
%patch -p3 -P 2
+ %patch -p1 -P 3
cp %{S:1} .
%build
diff --git a/php-kolab/Kolab_Freebusy/Makefile b/php-kolab/Kolab_Freebusy/Makefile
index d235313..2126eef 100644
--- a/php-kolab/Kolab_Freebusy/Makefile
+++ b/php-kolab/Kolab_Freebusy/Makefile
@@ -21,7 +21,7 @@ endif
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch package.xml
+EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch issue3537.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
diff --git a/php-kolab/Kolab_Freebusy/issue3537.patch b/php-kolab/Kolab_Freebusy/issue3537.patch
new file mode 100644
index 0000000..dbd89e6
--- /dev/null
+++ b/php-kolab/Kolab_Freebusy/issue3537.patch
@@ -0,0 +1,33 @@
+--- a/lib/Horde/Kolab/FreeBusy/Cache.php.orig 2009-04-06 15:23:35.000000000 +0200
++++ b/lib/Horde/Kolab/FreeBusy/Cache.php 2009-04-06 15:51:49.000000000 +0200
+@@ -363,9 +363,27 @@
+ /* Check if the calling user has access to the extended information of
+ * the folder we are about to integrate into the free/busy data.
+ */
+- $groups = $access->user_object->getGroups();
+- if (is_a($groups, 'PEAR_Error')) {
+- return $groups;
++ $uid_groups = $access->user_object->getGroups();
++ if (is_a($uid_groups, 'PEAR_Error')) {
++ return $uid_groups;
++ }
++
++ global $conf;
++ require_once 'Horde/Kolab/Server.php';
++ /* Connect to the Kolab user database */
++ $db = &Horde_Kolab_Server::singleton(array('uid' => $conf['kolab']['ldap']['phpdn']));
++
++ $groups = array();
++ foreach ($uid_groups as $uid) {
++ $group = $db->fetch($uid);
++ if (is_a($groups, 'PEAR_Error')) {
++ continue;
++ }
++ $mail = $group->get(KOLAB_ATTR_MAIL);
++ if (is_a($mail, 'PEAR_Error')) {
++ continue;
++ }
++ $groups[] = $mail;
+ }
+
+ $groups[] = $access->user;
diff --git a/release-notes.txt b/release-notes.txt
index a0a42c8..1127ee5 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -82,6 +82,7 @@ Changes between 2.2.1-rc-1 and 2.2.1:
kolab/issue3438 (kolabFreeBusyPast is not used)
kolab/issue3450 (freebusy/user@example.com.ifb returns extended
free/busy information)
+ kolab/issue3537 (Allowing xfb access to groups does not work)
- kolab-webadmin-2.2.1-20090331