diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-28 13:44:14 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-28 13:44:14 +0000 |
| commit | 1d60e86ae09578cbb684975403f52ce80eb42ed0 (patch) | |
| tree | e3d5555b02254133ecf12e8ef7e30afb669bb406 /frontends/php/include/perm.inc.php | |
| parent | 6742b51b998f18ff3ab0ba0fb78d4c30913ebf7e (diff) | |
| download | zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.tar.gz zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.tar.xz zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.zip | |
- [ZBX-237] fixed problem importing/exporting data (Artem)
- [DEV-90] fixes SQL for pgsql (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5207 97f52cf1-0a1b-0410-bd0e-c28be96e8082
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) |