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

Fixed problem with group view and strict users. Ticket#3223

This commit is contained in:
Arturo Gonzalez 2016-01-15 15:57:18 +01:00
parent 5e01c8892a
commit 0ff8562a61
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/include/functions_groupview.php
View File

@ -201,10 +201,6 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1); $list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1);
} }
else { else {
$_tag_condition = '';
if ($user_strict) {
$_tag_condition = ' AND ' . tags_get_acl_tags_module_condition($acltags,'tae');
}
foreach ($list_groups as $group) { foreach ($list_groups as $group) {
$group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_, $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
SUM(critical_count) AS _monitors_critical_, SUM(critical_count) AS _monitors_critical_,
@ -214,7 +210,7 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
SUM(fired_count) AS _monitors_alerts_fired_, SUM(fired_count) AS _monitors_alerts_fired_,
COUNT(*) AS _total_agents_, id_grupo, intervalo, COUNT(*) AS _total_agents_, id_grupo, intervalo,
ultimo_contacto, disabled ultimo_contacto, disabled
FROM tagente WHERE id_grupo = " . $group['id_grupo'] . $_tag_condition . " GROUP BY id_grupo"); FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " GROUP BY id_grupo");
$list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_'];
$list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_'];
$list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_'];
@ -564,7 +560,6 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
} }
} }
} }
//Eliminate the first comma //Eliminate the first comma
$fathers_id = substr($fathers_id, 1); $fathers_id = substr($fathers_id, 1);
//Takes the parents even without agents, complete groups //Takes the parents even without agents, complete groups
@ -573,11 +568,11 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
FROM tgrupo FROM tgrupo
WHERE id_grupo IN (" . $fathers_id . ") WHERE id_grupo IN (" . $fathers_id . ")
ORDER BY nombre COLLATE utf8_general_ci ASC"); ORDER BY nombre COLLATE utf8_general_ci ASC");
if (!empty($list_father_groups)) {
//Merges the arrays and eliminates the duplicates groups //Merges the arrays and eliminates the duplicates groups
$list_groups = array_merge($list_groups, $list_father_groups); $list_groups = array_merge($list_groups, $list_father_groups);
}
$list_groups = groupview_array_unique_multidim($list_groups, 'id_grupo'); $list_groups = groupview_array_unique_multidim($list_groups, 'id_grupo');
//Order groups (Father-children) //Order groups (Father-children)
$ordered_groups = groupview_order_groups_for_parents($list_groups); $ordered_groups = groupview_order_groups_for_parents($list_groups);
$ordered_ids = array(); $ordered_ids = array();
@ -732,11 +727,6 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1); $list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1);
} }
else { else {
$_tag_condition = "";
if ($user_strict) {
$_tag_condition = " AND " . tags_get_acl_tags_module_condition($acltags,'tae');
}
foreach ($list_groups as $group) { foreach ($list_groups as $group) {
$group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_, $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
SUM(critical_count) AS _monitors_critical_, SUM(critical_count) AS _monitors_critical_,
@ -746,7 +736,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
SUM(fired_count) AS _monitors_alerts_fired_, SUM(fired_count) AS _monitors_alerts_fired_,
COUNT(*) AS _total_agents_, id_grupo, intervalo, COUNT(*) AS _total_agents_, id_grupo, intervalo,
ultimo_contacto, disabled ultimo_contacto, disabled
FROM tagente WHERE id_grupo = " . $group['id_grupo'] . $_tag_condition . " GROUP BY id_grupo"); FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " GROUP BY id_grupo");
$list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_'];
$list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_'];
$list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_'];