Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop

This commit is contained in:
Daniel Maya 2017-02-22 11:47:07 +01:00
commit 51f78e5a8a
2 changed files with 6 additions and 5 deletions

View File

@ -7974,10 +7974,11 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $
switch ($type) { switch ($type) {
case 'modules': case 'modules':
$template_title['total_count'] = __('%d Total modules'); $template_title['total_count'] = __('%d Total modules');
$template_title['normal_count'] = __('%d Normal modules'); $template_title['normal_count'] = __('%d Modules in normal status');
$template_title['critical_count'] = __('%d Critical modules'); $template_title['critical_count'] = __('%d Modules in critical status');
$template_title['warning_count'] = __('%d Warning modules'); $template_title['warning_count'] = __('%d Modules in warning status');
$template_title['unknown_count'] = __('%d Unknown modules'); $template_title['unknown_count'] = __('%d Modules in unknown status');
$template_title['not_init_count'] = __('%d Not init modules');
break; break;
case 'agent': case 'agent':
$template_title['total_count'] = __('%d Total modules'); $template_title['total_count'] = __('%d Total modules');

View File

@ -601,7 +601,7 @@ foreach ($agents as $agent) {
$data[4] = ui_print_group_icon ($agent["id_grupo"], true); $data[4] = ui_print_group_icon ($agent["id_grupo"], true);
$agent['not_init_count'] = $agent['notinit_count']; $agent['not_init_count'] = $agent['notinit_count'];
$data[5] = reporting_tiny_stats($agent, true, 'agent', ':', $strict_user); $data[5] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
$data[6] = $status_img; $data[6] = $status_img;