From fe038789ad044a870ffab25255140b1542621209 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 30 Jul 2013 09:40:43 +0000 Subject: [PATCH] 2013-07-30 Juan Manuel Ramon * operation/events/events_list.php: Fix user filter in event list view. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8594 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++ .../operation/events/events_list.php | 31 +++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d0cacb0c9b..8447c1a9f5 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-07-30 Juan Manuel Ramon + + * operation/events/events_list.php: Fix user filter in + event list view. + 2013-07-30 Sergio Martin * godmode/groups/group_list.php: Fix pagination on diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index a97afb1b9c..765435eba1 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -387,10 +387,35 @@ $table_advanced->rowclass[] = ''; $data = array(); $data[0] = __('User ack.') . '
'; - -$user_users = users_get_user_users(); +$users = users_get_info (); +if ($users === false) + $users = array(); -$data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '', +$user_groups = users_get_groups($config['id_user'], "ER", users_can_manage_group_all(0)); + +$acl_column = get_acl_column("ER"); +$users_acl = array(); +foreach ($users as $user => $user_desc) { + + $query = sprintf("SELECT id_grupo + FROM tusuario_perfil, tperfil + WHERE tperfil.id_perfil = tusuario_perfil.id_perfil AND + tusuario_perfil.id_usuario = '%s' AND + tperfil.%s = 1 AND + (tusuario_perfil.id_grupo IN (%s)) + ORDER BY id_grupo", $user, $acl_column, implode(',',array_keys($user_groups))); + + $user_group = db_get_all_rows_sql($query); + + if ($user_group === false) { + continue; + } + + $users_acl[$user] = $user; + +} + +$data[0] .= html_print_select($users_acl, "id_user_ack", $id_user_ack, '', __('Any'), 0, true); $data[1] = ''; $table_advanced->data[] = $data;