From 36f22d429ca587cbce246286d2baa887dadb6072 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Wed, 29 Sep 2010 16:02:13 +0000 Subject: [PATCH] 2010-09-29 Sergio Martin * include/functions_db.php operation/messages/message.php: Fixed the ACLs to show only the user group users in the destination users combo for bug: 3077857 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_db.php | 2 +- pandora_console/operation/messages/message.php | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 967aa7117b..acf5c1805c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-09-29 Sergio Martin + + * include/functions_db.php + operation/messages/message.php: Fixed the ACLs + to show only the user group users in the destination + users combo for bug: 3077857 + 2010-09-29 Sergio Martin * godmode/massive/massive_copy_modules.php: Fixed the diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 8a673a6219..c2d28c0a41 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -3527,7 +3527,7 @@ function process_sql_rollback () { function get_group_users ($id_group, $filter = false) { if (! is_array ($filter)) $filter = array (); - $filter['id_grupo'] = (int) $id_group; + $filter['id_grupo'] = $id_group; $resulta = array(); $resulta = get_db_all_rows_filter ("tusuario_perfil", $filter); diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php index 9cf262163d..3e6c62d729 100644 --- a/pandora_console/operation/messages/message.php +++ b/pandora_console/operation/messages/message.php @@ -83,8 +83,14 @@ if (isset ($_GET["new_msg"])) { //create message '.__('Message to').': '; + + $users_full = get_group_users(array_keys(get_user_groups())); + + $users = array(); + foreach ($users_full as $user_id => $user_info) { + $users[$user_info['id_user']] = $user_info['fullname']; + } - $users = get_users_info (); //Get a list of all users $groups = get_user_groups ($config["id_user"], "AR"); //Get a list of all groups print_select ($users, "dest_user", $dest_user, '', __('-Select user-'), false, false, false, '', false);