Add ACL check to read-only category selection and nextmatch row color

This commit is contained in:
Nathan Gray 2013-03-06 15:30:06 +00:00
parent 49d8ddc3b6
commit 92e00bb0ec
2 changed files with 7 additions and 0 deletions

View File

@ -726,6 +726,9 @@ class etemplate extends boetemplate
{ {
static $cat2color; static $cat2color;
// ACL check
$cats = $GLOBALS['egw']->categories->check_list(EGW_ACL_READ,$cats);
if (!$cats) return null; if (!$cats) return null;
if (isset($cat2color[$cats])) if (isset($cat2color[$cats]))

View File

@ -175,6 +175,10 @@ class select_widget
if ($value) if ($value)
{ {
if (!is_array($value)) $value = explode(',',$value); if (!is_array($value)) $value = explode(',',$value);
// Filter ACL
$value = $GLOBALS['egw']->categories->check_list(EGW_ACL_READ,implode(',',$value));
$value = explode(',',$value);
foreach($value as $key => $id) foreach($value as $key => $id)
{ {
if ($id && ($name = stripslashes($GLOBALS['egw']->categories->id2name($id))) && $name != '--') if ($id && ($name = stripslashes($GLOBALS['egw']->categories->id2name($id))) && $name != '--')