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

Only give calendar categories where the user has access to the resource's calendar

Browse Source
This commit is contained in:
Nathan Gray 2011-06-03 00:05:37 +00:00
parent 0d66fcd9d1
commit 563b2f57ee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/inc/class.resources_ui.inc.php
View File

@ -477,7 +477,7 @@ class resources_ui
*/ */
function get_calendar_sidebox($param) function get_calendar_sidebox($param)
{ {
$cats = $this->bo->acl->get_cats(EGW_ACL_READ); $cats = $this->bo->acl->get_cats(EGW_ACL_CALREAD);
if (!$cats) return array(); if (!$cats) return array();
if(array_key_exists('return_array', $param)) if(array_key_exists('return_array', $param))
@ -492,6 +492,7 @@ class resources_ui
// this gets the resource-ids of the cats and implodes them to the array-key of the selectbox, // this gets the resource-ids of the cats and implodes them to the array-key of the selectbox,
// so it is possible to select all resources of a category // so it is possible to select all resources of a category
$allowed_list = array();
foreach($cats as $cat_id => $cat_name) foreach($cats as $cat_id => $cat_name)
{ {
if ($resources = $this->bo->so->search(array('cat_id' => $cat_id, 'bookable' => '1'),'res_id')) if ($resources = $this->bo->so->search(array('cat_id' => $cat_id, 'bookable' => '1'),'res_id'))
@ -500,6 +501,7 @@ class resources_ui
foreach($resources as $res) foreach($resources as $res)
{ {
$keys[] = 'r'.$res['res_id']; $keys[] = 'r'.$res['res_id'];
$allowed_list[] = $res['res_id'];
} }
$res_cats[implode(',',$keys)] = $cat_name; $res_cats[implode(',',$keys)] = $cat_name;
@ -521,6 +523,8 @@ class resources_ui
$selected[] = $owner; $selected[] = $owner;
} }
} }
// Take out resources not allowed by perms, above
$res_ids = array_intersect($res_ids,$allowed_list);
if (count($res_ids)) if (count($res_ids))
{ {
foreach($this->bo->so->search(array('res_id' => $res_ids),'res_id,name') as $data) foreach($this->bo->so->search(array('res_id' => $res_ids),'res_id,name') as $data)