From 6615cce7aaf92edabdcc33d9db91ff01c4fdbe0a Mon Sep 17 00:00:00 2001 From: artem Date: Fri, 1 Feb 2008 13:58:10 +0000 Subject: - [HAN-2] merged rev.5301:5304 of 1.4/ (Artem) [improved speed on coping triggers to host] - [DEV-103] fixes to users group jsmenu (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5305 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/users.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'frontends/php/include/users.inc.php') diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php index 4c2e8ae1..4e83a47d 100644 --- a/frontends/php/include/users.inc.php +++ b/frontends/php/include/users.inc.php @@ -412,11 +412,11 @@ { while($tmp = DBFetch($res)) $grp_list.= "'".$tmp['usrgrpid']."'".','; } - $grp_list=rtrim($grp_list,',').')'; + $grp_list.="'0')"; $res = DBselect('SELECT DISTINCT g.usrgrpid, g.name, g.gui_access, g.users_status'. ' FROM usrgrp g'. - ' WHERE g.usrgrpid NOT IN'.$grp_list. + ' WHERE g.usrgrpid NOT IN '.$grp_list. ' AND '.DBin_node('g.usrgrpid', get_current_nodeid(false)). ' ORDER BY g.name'); @@ -481,7 +481,8 @@ { while($tmp = DBFetch($res)) $grp_list.= "'".$tmp['usrgrpid']."'".','; } - $grp_list=rtrim($grp_list,',').')'; + $grp_list.="'0')"; +// $grp_list=rtrim($grp_list,',').')'; $res = DBselect('SELECT DISTINCT g.usrgrpid, g.name'. ' FROM usrgrp g'. @@ -532,7 +533,8 @@ { while($tmp = DBFetch($res)) $grp_list.= "'".$tmp['usrgrpid']."'".','; } - $grp_list=rtrim($grp_list,',').')'; + $grp_list.="'0')"; +// $grp_list=rtrim($grp_list,',').')'; $res = DBselect('SELECT DISTINCT g.usrgrpid, g.name'. ' FROM usrgrp g'. -- cgit