mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 18:31:37 +02:00
if we require an extra invite grant, we fail if that does not exist (bind privilege is not given in that case)
This commit is contained in:
parent
4c060a5889
commit
cea2c54ee1
@ -686,7 +686,10 @@ class calendar_groupdav extends groupdav_handler
|
|||||||
return $oldEvent;
|
return $oldEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_null($oldEvent) && ($user >= 0) && !$this->bo->check_perms(EGW_ACL_ADD, 0, $user))
|
if (is_null($oldEvent) && ($user >= 0 && !$this->bo->check_perms(EGW_ACL_ADD, 0, $user) ||
|
||||||
|
// if we require an extra invite grant, we fail if that does not exist (bind privilege is not given in that case)
|
||||||
|
$this->bo->require_acl_invite && $user && $user != $GLOBALS['egw_info']['user']['account_id'] &&
|
||||||
|
!$this->bo->check_acl_invite($user)))
|
||||||
{
|
{
|
||||||
// we have no add permission on this user's calendar
|
// we have no add permission on this user's calendar
|
||||||
// ToDo: create event in current users calendar and invite only $user
|
// ToDo: create event in current users calendar and invite only $user
|
||||||
@ -1129,8 +1132,7 @@ class calendar_groupdav extends groupdav_handler
|
|||||||
// remove bind privilege on other users or groups calendars, if calendar config require_acl_invite is set
|
// remove bind privilege on other users or groups calendars, if calendar config require_acl_invite is set
|
||||||
// and current user has no invite grant
|
// and current user has no invite grant
|
||||||
if ($user && $user != $GLOBALS['egw_info']['user']['account_id'] && isset($privileges['bind']) &&
|
if ($user && $user != $GLOBALS['egw_info']['user']['account_id'] && isset($privileges['bind']) &&
|
||||||
($this->bo->require_acl_invite == 'all' || $this->bo->require_acl_invite == 'groups' && $user < 0) &&
|
!$this->bo->check_acl_invite($user))
|
||||||
!$this->bo->check_perms(EGW_ACL_INVITE, 0, $user))
|
|
||||||
{
|
{
|
||||||
unset($privileges['bind']);
|
unset($privileges['bind']);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user