mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-23 05:41:02 +01:00
improved privacy on conflicting events - only check ACLs for invited participants and not all participant ACLs from conflicting event
This commit is contained in:
parent
28a778955c
commit
b2a3bf96a0
@ -224,12 +224,13 @@ class calendar_boupdate extends calendar_bo
|
|||||||
{
|
{
|
||||||
foreach($conflicts as $key => $conflict)
|
foreach($conflicts as $key => $conflict)
|
||||||
{
|
{
|
||||||
|
$conflict['participants'] = array_intersect_key($conflict['participants'],$event['participants']);
|
||||||
if (!$this->check_perms(EGW_ACL_READ,$conflict))
|
if (!$this->check_perms(EGW_ACL_READ,$conflict))
|
||||||
{
|
{
|
||||||
$conflicts[$key] = array(
|
$conflicts[$key] = array(
|
||||||
'id' => $conflict['id'],
|
'id' => $conflict['id'],
|
||||||
'title' => lang('busy'),
|
'title' => lang('busy'),
|
||||||
'participants' => array_intersect_key($conflict['participants'],$event['participants']),
|
'participants' => $conflict['participants'],
|
||||||
'start' => $conflict['start'],
|
'start' => $conflict['start'],
|
||||||
'end' => $conflict['end'],
|
'end' => $conflict['end'],
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user