extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from marcelklehr/fix/resource-access-control

Browse Source 
Fix calendar invitations of resources
This commit is contained in:
Ralf Becker 2018-06-27 16:13:05 +02:00 committed by GitHub
commit 9148b4665d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,12 @@ class calendar_boupdate extends calendar_bo
* @var array id => data * @var array id => data
*/ */
protected static $tz_cache = array(); protected static $tz_cache = array();
/**
* The resources storage object
* @var resources_so $resources_so
*/
protected $resources_so;
/** /**
* Constructor * Constructor
@ -88,6 +94,8 @@ class calendar_boupdate extends calendar_bo
if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True); if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
parent::__construct(); // calling the parent constructor parent::__construct(); // calling the parent constructor
$this->resources_so = new resources_so();
if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True); if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
} }
@ -511,7 +519,8 @@ class calendar_boupdate extends calendar_bo
{ {
$resources_config = Api\Config::read('resources'); $resources_config = Api\Config::read('resources');
if ($resources_config['bookingrequests'] === 'disabled') { if ($resources_config['bookingrequests'] === 'disabled') {
$ret = $this->check_perms(resources_acl_bo::DIRECT_BOOKING, 0, $uid); $cat_id = $this->resources_so->get_value('cat_id', intval(substr($uid, 1)));
return resources_acl_bo::is_permitted($cat_id, resources_acl_bo::DIRECT_BOOKING);
} }
else else
{ {