From 3f8cf5f0da75fa8312c173e9e2c1e1e843811091 Mon Sep 17 00:00:00 2001 From: artem Date: Fri, 20 Jun 2008 08:42:25 +0000 Subject: - [DEV-137] changes in users profile system (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5782 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/perm.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'frontends/php/include/perm.inc.php') diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php index 17299831..65bcf4c1 100644 --- a/frontends/php/include/perm.inc.php +++ b/frontends/php/include/perm.inc.php @@ -399,8 +399,9 @@ COpt::counter_up('perm'); function get_accessible_nodes_by_user(&$user_data,$perm,$perm_res=null,$nodeid=null){ global $ZBX_LOCALNODEID, $ZBX_NODES_IDS; - + if(is_null($nodeid)) $nodeid = $ZBX_NODES_IDS; + if(!is_array($nodeid)) $nodeid = array($nodeid); if(is_null($perm_res)) $perm_res=PERM_RES_STRING_LINE; $userid =& $user_data['userid']; @@ -414,7 +415,7 @@ function get_accessible_nodes_by_user(&$user_data,$perm,$perm_res=null,$nodeid=n //COpt::counter_up('perm'); if(USER_TYPE_SUPER_ADMIN == $user_type){ - $nodes = DBselect('SELECT nodeid FROM nodes WHERE '.DBcondition('nodeid',$nodeid)); + $nodes = DBselect('SELECT nodeid FROM nodes WHERE '.DBcondition('nodeid', $nodeid)); while($node = DBfetch($nodes)){ $node_data[$node['nodeid']] = $node; $node_data[$node['nodeid']]['permission'] = PERM_READ_WRITE; -- cgit