From fb6cfee24cd488ed1c5e9dbbc46b8279d678af2e Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Mon, 19 Mar 2018 16:58:44 +0100 Subject: [PATCH] Allow disabling calendar invitations of resources --- calendar/inc/class.calendar_boupdate.inc.php | 15 ++++++++++++--- resources/templates/default/config.xet | 10 ++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index 2c7647a55d..7349965432 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -507,9 +507,18 @@ class calendar_boupdate extends calendar_bo */ public function check_acl_invite($uid) { - if (!is_numeric($uid)) return true; // nothing implemented for resources so far - - if (!$this->require_acl_invite) + if (!is_numeric($uid)) + { + $resources_config = Api\Config::read('resources'); + if ($resources_config['bookingrequests'] === 'disabled') { + $ret = $this->check_perms(resources_acl_bo::DIRECT_BOOKING, 0, $uid); + } + else + { + $ret = true; + } + } + elseif (!$this->require_acl_invite) { $ret = true; // no grant required } diff --git a/resources/templates/default/config.xet b/resources/templates/default/config.xet index 3cd1ea8a6e..857720fb97 100644 --- a/resources/templates/default/config.xet +++ b/resources/templates/default/config.xet @@ -17,6 +17,16 @@ + + + + + + +