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

Fixed sql error and added "no actions" text in alert module reports. Ticket #4301

Browse Source 
(cherry picked from commit fa8f6ca37ca3a2c329fdc3b9a7cb090ed146e875)
This commit is contained in:
Arturo Gonzalez 2016-12-22 16:27:20 +01:00 committed by daniel
parent afd773867c
commit 11dccd9054
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_reporting.php
View File

@ -2939,7 +2939,7 @@ function reporting_alert_report_module($report, $content) {
} }
$data = array(); $data = array();
$actions = array();
foreach ($alerts as $alert) { foreach ($alerts as $alert) {
$data_row = array(); $data_row = array();
@ -2968,15 +2968,22 @@ function reporting_alert_report_module($report, $content) {
$id_action = 0; $id_action = 0;
} }
else { else {
if ($id_action != null) {
$actions = db_get_all_rows_sql('SELECT name $actions = db_get_all_rows_sql('SELECT name
FROM talert_actions FROM talert_actions
WHERE id = ' . $id_action); WHERE id = ' . $id_action);
} }
}
if (empty($actions)) {
$data_row['action'][] = __('No defined actions');
}
else {
$data_row['action'] = array(); $data_row['action'] = array();
foreach ($actions as $action) { foreach ($actions as $action) {
$data_row['action'][] = $action['name']; $data_row['action'][] = $action['name'];
} }
}
$data_row['fired'] = array(); $data_row['fired'] = array();
$firedTimes = get_module_alert_fired( $firedTimes = get_module_alert_fired(