extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing no grant required for inviting contacts

Browse Source
This commit is contained in:
Ralf Becker 2018-10-09 18:59:20 +02:00
parent e225b2d0ec
commit 3752737838
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Contacts.php
View File

@ -1650,7 +1650,7 @@ class Contacts extends Contacts\Storage
$data[] = array( $data[] = array(
'res_id' => $id, 'res_id' => $id,
'email' => $contact['email'] ? $contact['email'] : $contact['email_home'], 'email' => $contact['email'] ? $contact['email'] : $contact['email_home'],
'rights' => Acl::CUSTOM1, 'rights' => Acl::CUSTOM1|Acl::CUSTOM3, // calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
'name' => $this->link_title($contact), 'name' => $this->link_title($contact),
'cn' => trim($contact['n_given'].' '.$contact['n_family']), 'cn' => trim($contact['n_given'].' '.$contact['n_family']),
); );

4
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -512,10 +512,6 @@ class calendar_boupdate extends calendar_bo
// Resource specific ACL check // Resource specific ACL check
return call_user_func($this->resources[$uid[0]]['check_invite'], $uid); return call_user_func($this->resources[$uid[0]]['check_invite'], $uid);
} }
elseif (!is_numeric($uid)) // contact, no grant required
{
$ret = true;
}
elseif (!$this->require_acl_invite) elseif (!$this->require_acl_invite)
{ {
$ret = true; // no grant required $ret = true; // no grant required