From 3752737838922f17b953af51de0143e13ef77fda Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 9 Oct 2018 18:59:20 +0200 Subject: [PATCH] fixing no grant required for inviting contacts --- api/src/Contacts.php | 2 +- calendar/inc/class.calendar_boupdate.inc.php | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/api/src/Contacts.php b/api/src/Contacts.php index 2737f57129..c8b58c4d89 100755 --- a/api/src/Contacts.php +++ b/api/src/Contacts.php @@ -1650,7 +1650,7 @@ class Contacts extends Contacts\Storage $data[] = array( 'res_id' => $id, '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), 'cn' => trim($contact['n_given'].' '.$contact['n_family']), ); diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index a71ade3c23..e3594d0eff 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -512,10 +512,6 @@ class calendar_boupdate extends calendar_bo // Resource specific ACL check 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) { $ret = true; // no grant required