diff options
Diffstat (limited to 'frontends/php/include/perm.inc.php')
| -rw-r--r-- | frontends/php/include/perm.inc.php | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php index 00d1f53f..5354e087 100644 --- a/frontends/php/include/perm.inc.php +++ b/frontends/php/include/perm.inc.php @@ -314,12 +314,6 @@ COpt::counter_up('perm'); $result= array(); - switch($perm_res) - { - case PERM_RES_DATA_ARRAY: $resdata = '$node_data'; break; - default: $resdata = '$node_data["nodeid"]'; break; - } - COpt::counter_up('perm_nodes['.$userid.','.$perm.','.$perm_mode.','.$perm_res.','.$nodeid.']'); COpt::counter_up('perm'); @@ -377,19 +371,16 @@ COpt::counter_up('perm'); } /* special processing for PERM_READ_LIST*/ - if(PERM_DENY == $node_data['permission'] && PERM_READ_LIST == $perm) - { + if(PERM_DENY == $node_data['permission'] && PERM_READ_LIST == $perm){ $groups = get_accessible_groups_by_user($user_data, $perm, PERM_MODE_GE,PERM_RES_DATA_ARRAY,$node_data['nodeid']); if(count($groups) == 0) continue; } - else - { + else{ if(eval('return ('.$node_data["permission"].' '.perm_mode2comparator($perm_mode).' '.$perm.')? 0 : 1;')) continue; } - - $result[$node_data["nodeid"]] = eval('return '.$resdata.';'); + $result[$node_data["nodeid"]]= ($perm_res == PERM_RES_DATA_ARRAY)?$node_data:$node_data["nodeid"]; } if($perm_res == PERM_RES_STRING_LINE) |