extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix group invitations were left out of "not rejected" filter

Browse Source
This commit is contained in:
nathan 2023-03-24 09:16:06 -06:00
parent d567897e9d
commit 0b5daa0fb6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/inc/class.calendar_bo.inc.php
View File

@ -507,16 +507,22 @@ class calendar_bo
// for groups we have to include the members // for groups we have to include the members
if ($GLOBALS['egw']->accounts->get_type($user) == 'g') 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); $members = $GLOBALS['egw']->accounts->members($user, true);
if (is_array($members)) if(is_array($members))
{ {
foreach($members as $member) foreach($members as $member)
{ {
// use only members which gave the user a read-grant // use only members which gave the user a read-grant
if (!in_array($member, $users) && if(!in_array($member, $users) &&
($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member))) ($ignore_acl || $this->check_perms(Acl::READ | ($use_freebusy ? self::ACL_FREEBUSY : 0), 0, $member)))
{ {
$users[] = $member; $users[] = $member;
} }