From 23100e74f1c8b6921375d8f8dd07c37d3810e47f Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel
Date: Fri, 1 May 2009 08:43:54 +0200 Subject: [PATCH] Fix listing objects by groups. --- framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php index 7fc44b2c8..27990d9bb 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php @@ -385,18 +385,20 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server } if (!empty($vars['required_group'])) { - $required_group = $this->fetch($vars['required_group'], - 'Horde_Kolab_Server_Object_Kolabgroupofnames'); + $required_group = new Horde_Kolab_Server_Object_Kolabgroupofnames($this, + null, + $vars['required_group']); } $objects = array(); foreach ($data as $uid => $entry) { - if (!empty($vars['required_group']) && $required_group->isMember($uid)) { - continue; + if (!empty($vars['required_group'])) { + if (!$required_group->exists() || !$required_group->isMember($uid)) { + continue; + } } - $result = &Horde_Kolab_Server_Object::factory($type, $uid, - $this, $entry); - $objects[$uid] = $result; + $objects[$uid] = &Horde_Kolab_Server_Object::factory($type, $uid, + $this, $entry); } return $objects; } -- 2.11.0