From 00d08bcdd64c14fb6c8f25f353ba89b862d9c492 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 16 Apr 2010 14:44:06 +0000 Subject: [PATCH] 2010-04-16 Sergio Martin * operation/users/user.php: Modified the users that are showed in the View users section. Now, the users of the logged user group are listed. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/operation/users/user.php | 23 +++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index afbd1e76d3..303f0bbc65 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-04-16 Sergio Martin + + * operation/users/user.php: Modified the users that + are showed in the View users section. Now, the users + of the logged user group are listed. + + 2010-04-16 Pablo de la Concepción * include/ajax/agent.php: Modified to return the agent name at the i diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php index 78ed68be85..12abc8d06b 100644 --- a/pandora_console/operation/users/user.php +++ b/pandora_console/operation/users/user.php @@ -40,11 +40,26 @@ $table->head[4] = __('Description'); $table->align[2] = "center"; $table->align[3] = "center"; + $info = array (); -if (give_acl ($config["id_user"], 0, "UM") == 1) { - $info = get_users (); -} else { - $info[$config["id_user"]] = get_user_info ($config["id_user"]); +$info = get_users (); + +//Only the users from the user groups are visible + +$user_groups = get_user_groups ($config["id_user"]); +$user_groups_id = array_keys($user_groups); +$users_id = array(); + +foreach ($user_groups_id as $group) { + $user_group_users = get_group_users($group); + foreach ($user_group_users as $user_group_user) + array_push($users_id,get_user_id ($user_group_user)); +} + +$users_hidden = array_diff(array_keys($info),$users_id); + +foreach($users_hidden as $user_hidden){ + unset($info[$user_hidden]); } $rowPair = true;