From 84c14710dba71bac3b3a7323684cd6df895c3fe6 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 24 Mar 2023 09:16:06 -0600 Subject: [PATCH] Calendar: Fix group invitations were left out of "not rejected" filter --- calendar/inc/class.calendar_bo.inc.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 011aa4a799..c5337fe81b 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -507,16 +507,22 @@ class calendar_bo // for groups we have to include the members if ($GLOBALS['egw']->accounts->get_type($user) == 'g') { - if ($no_enum_groups) continue; + // Include the group itself to catch group invitations + $users[] = $user; + + if($no_enum_groups) + { + continue; + } $members = $GLOBALS['egw']->accounts->members($user, true); - if (is_array($members)) + if(is_array($members)) { foreach($members as $member) { // use only members which gave the user a read-grant - if (!in_array($member, $users) && - ($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member))) + if(!in_array($member, $users) && + ($ignore_acl || $this->check_perms(Acl::READ | ($use_freebusy ? self::ACL_FREEBUSY : 0), 0, $member))) { $users[] = $member; }