tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in group alert report data visualization

Browse Source
This commit is contained in:
alejandro-campos 2020-01-28 10:06:46 +01:00
parent e35edd92b3
commit d79137148c
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_console/include/functions_reporting.php
View File

@ -3821,10 +3821,15 @@ function reporting_alert_report_group($report, $content)
foreach ($actions['custom'] as $action) { foreach ($actions['custom'] as $action) {
$data_action[$naction]['name'] = $action['name']; $data_action[$naction]['name'] = $action['name'];
$fired = $action['fired']; $fired = $action['fired'];
if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) {
if ($fired == 0) {
$data_action[$naction]['fired'] = '----------------------------'; $data_action[$naction]['fired'] = '----------------------------';
} else { } else if ($fired > 0) {
$data_action[$naction]['fired'] = $fired; if ($fired > $datelimit && $fired < $datetime) {
$data_action[$naction]['fired'] = $fired;
} else {
continue 2;
}
} }
$naction++; $naction++;
@ -3833,10 +3838,15 @@ function reporting_alert_report_group($report, $content)
foreach ($actions['default'] as $action) { foreach ($actions['default'] as $action) {
$data_action[$naction]['name'] = $action['name']; $data_action[$naction]['name'] = $action['name'];
$fired = $action['fired']; $fired = $action['fired'];
if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) {
if ($fired == 0) {
$data_action[$naction]['fired'] = '----------------------------'; $data_action[$naction]['fired'] = '----------------------------';
} else { } else if ($fired > 0) {
$data_action[$naction]['fired'] = $fired; if ($fired > $datelimit && $fired < $datetime) {
$data_action[$naction]['fired'] = $fired;
} else {
continue 2;
}
} }
$naction++; $naction++;
@ -3845,10 +3855,15 @@ function reporting_alert_report_group($report, $content)
foreach ($actions['unavailable'] as $action) { foreach ($actions['unavailable'] as $action) {
$data_action[$naction]['name'] = $action['name']; $data_action[$naction]['name'] = $action['name'];
$fired = $action['fired']; $fired = $action['fired'];
if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) {
if ($fired == 0) {
$data_action[$naction]['fired'] = '----------------------------'; $data_action[$naction]['fired'] = '----------------------------';
} else { } else if ($fired > 0) {
$data_action[$naction]['fired'] = $fired; if ($fired > $datelimit && $fired < $datetime) {
$data_action[$naction]['fired'] = $fired;
} else {
continue 2;
}
} }
$naction++; $naction++;