tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios-4' into 'develop' 

[Secondary groups] Fixed monitor permission checking in metaconsole

See merge request artica/pandorafms!1699
This commit is contained in:
vgilc 2018-08-20 12:41:04 +02:00
parent ad6a3d69e8 09a80abdd2
commit 99569017cd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/operation/agentes/status_monitor.php
View File

@ -834,6 +834,11 @@ else {
$result_server[$result_element_key]['server_url'] = $server['server_url'].'/';
$result_server[$result_element_key]['hashdata'] = $hashdata;
$result_server[$result_element_key]['user'] = $config['id_user'];
$result_server[$result_element_key]['groups_in_server'] =
agents_get_all_groups_agent(
$result_element_value['id_agent'],
$result_element_value['id_group']
);
$count_modules++;
@ -1036,7 +1041,9 @@ if (!empty($result)) {
$data[2] = html_print_image('images/' . modules_show_icon_type ($row['module_type']), true);
$agent_groups = agents_get_all_groups_agent($row['id_agent'], $row['id_group']);
$agent_groups = is_metaconsole()
? $row['groups_in_server']
: agents_get_all_groups_agent($row['id_agent'], $row['id_group']);
if (check_acl_one_of_groups ($config['id_user'], $agent_groups, 'AW')) {
$show_edit_icon = true;
if (defined('METACONSOLE')) {