mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Fix calendar invitations of resources
Used to prevent anyone from inviting when general access was disabled now it only prevents users who don't have direct booking permission. see #38
This commit is contained in:
parent
65aca7c311
commit
75572b64c8
@ -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
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user