diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index f830f47dbd..e567f20716 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -412,65 +412,56 @@ $url_up_template = $url.'&sort_field=template&sort=up&pure='.$pure;
$url_down_template = $url.'&sort_field=template&sort=down&pure='.$pure;
-$table = new stdClass();
+$table_alert_list = new stdClass();
if (is_metaconsole()) {
- $table->class = 'alert_list databox';
+ $table_alert_list->class = 'alert_list databox';
} else {
- $table->class = 'info_table';
+ $table_alert_list->class = 'info_table';
}
-$table->width = '100%';
-$table->cellpadding = 0;
-$table->cellspacing = 0;
-$table->size = [];
+$table_alert_list->width = '100%';
+$table_alert_list->cellpadding = 0;
+$table_alert_list->cellspacing = 0;
+$table_alert_list->size = [];
-$table->align = [];
-$table->align[0] = 'left';
-$table->align[1] = 'left';
-$table->align[2] = 'left';
-$table->align[3] = 'left';
-$table->align[4] = 'left';
+$table_alert_list->align = [];
+$table_alert_list->align[0] = 'left';
+$table_alert_list->align[1] = 'left';
+$table_alert_list->align[2] = 'left';
+$table_alert_list->align[3] = 'left';
+$table_alert_list->align[4] = 'left';
-$table->head = [];
+$table_alert_list->head = [];
if (! $id_agente) {
- $table->style = [];
- $table->style[0] = 'font-weight: bold;';
- $table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
- $table->headstyle[0] = 'width: 100%; min-width: 12em;';
- $table->headstyle[1] = 'min-width: 15em;';
- $table->headstyle[2] = 'min-width: 20em;';
- $table->headstyle[3] = 'min-width: 1em;';
- $table->headstyle[4] = 'min-width: 15em;';
-
- /*
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
- $table->size[4] = '8%';
- }*/
+ $table_alert_list->style = [];
+ $table_alert_list->style[0] = 'font-weight: bold;';
+ $table_alert_list->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
} else {
- $table->head[0] = __('Module').ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
- $table->headstyle[0] = 'width: 100%; min-width: 15em;';
- $table->headstyle[1] = 'min-width: 15em;';
- $table->headstyle[2] = 'min-width: 20em;';
- $table->headstyle[3] = 'min-width: 1em;';
- $table->headstyle[4] = 'min-width: 15em;';
+ $table_alert_list->head[0] = __('Module').ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
}
-$table->head[1] = __('Template').ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
-$table->head[2] = __('Actions');
-$table->head[3] = __('Status');
-$table->head[4] = "".__('Op.').'';
+$table_alert_list->head[1] = __('Status');
+$table_alert_list->head[2] = __('Template').ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
+$table_alert_list->head[3] = __('Actions');
+$table_alert_list->head[4] = "".__('Op.').'';
-$table->valign[0] = 'middle';
-$table->valign[1] = 'middle';
-$table->valign[2] = 'middle';
-$table->valign[3] = 'middle';
-$table->valign[4] = 'middle';
+$table_alert_list->headstyle[0] = 'min-width: 200px; width:30%;';
+$table_alert_list->headstyle[1] = 'min-width: 50px; width:8%';
+$table_alert_list->headstyle[2] = 'min-width: 150px; width:22%;';
+$table_alert_list->headstyle[3] = 'min-width: 200px; width:30%;';
+$table_alert_list->headstyle[4] = 'min-width: 150px; width:10%;';
-$table->style[4] = 'min-width:80px';
+$table_alert_list->valign[0] = 'middle';
+$table_alert_list->valign[1] = 'middle';
+$table_alert_list->valign[2] = 'middle';
+$table_alert_list->valign[3] = 'middle';
+$table_alert_list->valign[4] = 'middle';
-$table->data = [];
+$table_alert_list->cellstyle = [];
+
+$table_alert_list->data = [];
$url .= $sort_params;
@@ -479,14 +470,14 @@ $iterator = 0;
foreach ($simple_alerts as $alert) {
if ($alert['disabled']) {
- $table->rowstyle[$iterator] = 'font-style: italic; color: #aaaaaa;';
- $table->style[$iterator][1] = 'font-style: italic; color: #aaaaaa;';
+ $table_alert_list->rowstyle[$iterator] = 'font-style: italic; color: #aaaaaa;';
+ $table_alert_list->style[$iterator][2] = 'font-style: italic; color: #aaaaaa;';
}
if ($rowPair) {
- $table->rowclass[$iterator] = 'rowPair';
+ $table_alert_list->rowclass[$iterator] = 'rowPair';
} else {
- $table->rowclass[$iterator] = 'rowOdd';
+ $table_alert_list->rowclass[$iterator] = 'rowOdd';
}
$rowPair = !$rowPair;
@@ -523,38 +514,53 @@ foreach ($simple_alerts as $alert) {
$all_groups = agents_get_all_groups_agent($id_agente);
}
- $module_name = modules_get_agentmodule_name($alert['id_agent_module']);
- $data[0] .= ui_print_truncate_text($module_name, 'module_medium', false, true, true, '[…]', 'display:block;font-size: 7.2pt').'
';
+ $status = STATUS_ALERT_NOT_FIRED;
+ $title = '';
+ if ($alert['times_fired'] > 0) {
+ $status = STATUS_ALERT_FIRED;
+ $title = __('Alert fired').' '.$alert['internal_counter'].' '.__('time(s)');
+ } else if ($alert['disabled'] > 0) {
+ $status = STATUS_ALERT_DISABLED;
+ $title = __('Alert disabled');
+ } else {
+ $status = STATUS_ALERT_NOT_FIRED;
+ $title = __('Alert not fired');
+ }
+
+ $module_name = modules_get_agentmodule_name($alert['id_agent_module']);
+ $data[0] .= ui_print_truncate_text($module_name, 'module_medium', false, true, true, '[…]', 'display:block;font-weight:normal;').'
';
+
+ $data[1] = ui_print_status_image($status, $title, true);
$template_group = db_get_value('id_group', 'talert_templates', 'id', $alert['id_alert_template']);
// The access to the template manage page is necessary have LW permissions on template group
if (check_acl($config['id_user'], $template_group, 'LW')) {
- $data[1] .= "";
+ $data[2] .= "";
}
- $data[1] .= ui_print_truncate_text(
+ $data[2] .= ui_print_truncate_text(
alerts_get_alert_template_name($alert['id_alert_template']),
'module_medium',
false,
true,
true,
'[…]',
- 'font-size: 7.1pt'
+ ''
);
- $data[1] .= ' ';
- $data[1] .= html_print_image('images/zoom.png', true, ['id' => 'template-details-'.$alert['id_alert_template'], 'class' => 'img_help']);
- $data[1] .= ' ';
+ $data[2] .= html_print_image('images/zoom.png', true, ['id' => 'template-details-'.$alert['id_alert_template'], 'class' => 'img_help action_button_img']);
+ $data[2] .= ' ';
if (check_acl($config['id_user'], $template_group, 'LW') || check_acl($config['id_user'], $template_group, 'LM')) {
- $data[1] .= '';
+ $data[2] .= '';
}
$actions = alerts_get_alert_agent_module_actions($alert['id']);
- $data[2] = "
| ';
- $data[2] .= ''; - $data[2] .= ' | |
| ';
+ $data[3] .= '||
';
- $data[2] .= '
| ';
+ $data[3] .= '