From 41ba768c366a9bbc03d2b793dd40cacc2731455b Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Wed, 16 Feb 2011 11:11:05 +0000 Subject: [PATCH] 2011-02-16 Juan Manuel Ramon * godmode/users/user_list.php: If user is not admin then don't display users of others groups. Fixes: #3175670 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3869 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/users/user_list.php | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index eda0558477..f13f830f86 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-02-16 Juan Manuel Ramon + + * godmode/users/user_list.php: If user is not admin then don't + display users of others groups. + + Fixes: #3175670 + 2011-02-16 Miguel de Dios * include/functions_visual_map.php: fixed the position of items in visual diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index 7bd84c1316..d07b567963 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -147,14 +147,21 @@ $info1 = get_users ($order, array ('offset' => (int) get_parameter ('offset'), $info = array(); $own_info = get_user_info ($config['id_user']); +$own_groups = get_user_groups ($config['id_user'], 'AR', $own_info['is_admin']); if ($own_info['is_admin']) $info = $info1; -// If user is not admin then don't display admin users. +// If user is not admin then don't display admin users and user of others groups. else - foreach ($info1 as $key => $usr) - if (!$usr['is_admin']) + foreach ($info1 as $key => $usr){ + $u = get_user_info ($key); + $g = get_user_groups ($key, 'AR', $u['is_admin']); + $result = array_intersect($g, $own_groups); + if (!$usr['is_admin'] && !empty($result)) $info[$key] = $usr; + unset($u); + unset($g); + } // Prepare pagination pagination (count(get_users ()));