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

Merge branch '1970_La_lista_de_campos_no_se_esta_aplicando_correctamente' into 'develop' 

Fixed fields list in manage events-custom fields

See merge request artica/pandorafms!1633
This commit is contained in:
vgilc 2018-10-03 13:21:07 +02:00
parent 46830a4cbe 3c54710d1b
commit ef7ca68d4a
1 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
pandora_console/operation/events/events.build_table.php
View File

@ -156,12 +156,13 @@ else {
$table->align[$i] = 'left';
$i++;
if (in_array('server_name', $show_fields)) {
foreach ($show_fields as $k_s => $fields) {
if ($fields == 'server_name') {
$table->head[$i] = __('Server');
$table->align[$i] = 'left';
$i++;
}
if (in_array('estado', $show_fields)) {
if ($fields == 'estado') {
$table->head[$i] = __('Status') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'status')),
'sort'
@ -169,7 +170,7 @@ else {
$table->align[$i] = 'left';
$i++;
}
if (in_array('id_evento', $show_fields)) {
if ($fields == 'id_evento') {
$table->head[$i] = __('Event ID') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'event_id')),
'sort'
@ -178,7 +179,7 @@ else {
$i++;
}
if (in_array('evento', $show_fields)) {
if ($fields == 'evento') {
$table->head[$i] = __('Event Name') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'event_name')),
'sort'
@ -187,7 +188,7 @@ else {
$table->style[$i] = 'min-width: 200px; max-width: 350px; word-break: break-all;';
$i++;
}
if (in_array('id_agente', $show_fields)) {
if ($fields == 'id_agente') {
$table->head[$i] = __('Agent name') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'agent_id')),
'sort'
@ -196,7 +197,7 @@ else {
$table->style[$i] = 'max-width: 350px; word-break: break-all;';
$i++;
}
if (in_array('timestamp', $show_fields)) {
if ($fields == 'timestamp') {
$table->head[$i] = __('Timestamp') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'timestamp')),
'sort'
@ -205,7 +206,7 @@ else {
$i++;
}
if (in_array('id_usuario', $show_fields)) {
if ($fields == 'id_usuario') {
$table->head[$i] = __('User') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'user_id')),
'sort'
@ -214,7 +215,7 @@ else {
$i++;
}
if (in_array('owner_user', $show_fields)) {
if ($fields == 'owner_user') {
$table->head[$i] = __('Owner') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'owner')),
'sort'
@ -223,7 +224,7 @@ else {
$i++;
}
if (in_array('id_grupo', $show_fields)) {
if ($fields == 'id_grupo') {
$table->head[$i] = __('Group') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'group_id')),
'sort'
@ -232,7 +233,7 @@ else {
$i++;
}
if (in_array('event_type', $show_fields)) {
if ($fields == 'event_type') {
$table->head[$i] = __('Event Type') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'event_type')),
'sort'
@ -242,7 +243,7 @@ else {
$table->style[$i] = 'min-width: 85px;';
$i++;
}
if (in_array('id_agentmodule', $show_fields)) {
if ($fields == 'id_agentmodule') {
$table->head[$i] = __('Module Name') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'module_name')),
'sort'
@ -251,7 +252,7 @@ else {
$i++;
}
if (in_array('id_alert_am', $show_fields)) {
if ($fields == 'id_alert_am') {
$table->head[$i] = __('Alert') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'alert_id')),
'sort'
@ -261,7 +262,7 @@ else {
$i++;
}
if (in_array('criticity', $show_fields)) {
if ($fields == 'criticity') {
$table->head[$i] = __('Severity') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'criticity')),
'sort'
@ -270,7 +271,7 @@ else {
$i++;
}
if (in_array('user_comment', $show_fields)) {
if ($fields == 'user_comment') {
$table->head[$i] = __('Comment') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'comment')),
'sort'
@ -279,7 +280,7 @@ else {
$i++;
}
if (in_array('tags', $show_fields)) {
if ($fields == 'tags') {
$table->head[$i] = __('Tags') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'tags')),
'sort'
@ -288,7 +289,7 @@ else {
$i++;
}
if (in_array('source', $show_fields)) {
if ($fields == 'source') {
$table->head[$i] = __('Source') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'source')),
'sort'
@ -296,7 +297,7 @@ else {
$i++;
}
if (in_array('id_extra', $show_fields)) {
if ($fields == 'id_extra') {
$table->head[$i] = __('Extra ID') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'extra_id')),
'sort'
@ -305,7 +306,7 @@ else {
$i++;
}
if (in_array('ack_utimestamp', $show_fields)) {
if ($fields == 'ack_utimestamp') {
$table->head[$i] = __('ACK Timestamp') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'ack_utimestamp')),
'sort'
@ -314,13 +315,13 @@ else {
$i++;
}
if (in_array('instructions', $show_fields)) {
if ($fields == 'instructions') {
$table->head[$i] = __('Instructions');
$table->align[$i] = 'left';
$i++;
}
if (in_array('data', $show_fields)) {
if ($fields == 'data') {
$table->head[$i] = __('Data') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'data')),
'sort'
@ -329,7 +330,7 @@ else {
$i++;
}
if (in_array('module_status', $show_fields)) {
if ($fields == 'module_status') {
$table->head[$i] = __('Module Status') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'module_status')),
'sort'
@ -337,6 +338,7 @@ else {
$i++;
}
}
if ($i != 0 && $allow_action) {
$table->head[$i] = __('Action');
$table->align[$i] = 'left';
@ -447,35 +449,6 @@ else {
$i++;
if (in_array('server_name',$show_fields)) {
if ($meta) {
if (can_user_access_node ()) {
$data[$i] = "<a href='" . $event["server_url"] . "/index.php?sec=estado&sec2=operation/agentes/group_view" . $event['server_url_hash'] . "'>" . $event["server_name"] . "</a>";
}
else {
$data[$i] = $event["server_name"];
}
}
else {
$data[$i] = db_get_value('name','tserver');
}
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('estado',$show_fields)) {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status",
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
$i++;
}
if (in_array('id_evento',$show_fields)) {
$data[$i] = $event["id_evento"];
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
switch ($event["criticity"]) {
default:
case 0:
@ -500,8 +473,37 @@ else {
$img_sev = "images/status_sets/default/severity_major.png";
break;
}
foreach ($show_fields as $k_s => $fields) {
if ($fields == 'server_name') {
if ($meta) {
if (can_user_access_node ()) {
$data[$i] = "<a href='" . $event["server_url"] . "/index.php?sec=estado&sec2=operation/agentes/group_view" . $event['server_url_hash'] . "'>" . $event["server_name"] . "</a>";
}
else {
$data[$i] = $event["server_name"];
}
}
else {
$data[$i] = db_get_value('name','tserver');
}
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if ($fields == 'estado') {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status",
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
$i++;
}
if ($fields == 'id_evento') {
$data[$i] = $event["id_evento"];
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('evento', $show_fields)) {
if ($fields == 'evento') {
// Event description
$data[$i] = '<span title="' . strip_tags(io_safe_output($event["evento"])) . '" class="f9">';
if($allow_action) {
@ -516,7 +518,7 @@ else {
$i++;
}
if (in_array('id_agente', $show_fields)) {
if ($fields == 'id_agente') {
$data[$i] = '<span class="'.$myclass.'">';
if ($event["id_agente"] > 0) {
@ -549,7 +551,7 @@ else {
$i++;
}
if (in_array('timestamp', $show_fields)) {
if ($fields == 'timestamp') {
//Time
$data[$i] = '<span class="'.$myclass.'">';
if ($group_rep == 1) {
@ -563,7 +565,7 @@ else {
$i++;
}
if (in_array('id_usuario',$show_fields)) {
if ($fields == 'id_usuario') {
$user_name = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']);
if(empty($user_name)) {
$user_name = $event['id_usuario'];
@ -573,7 +575,7 @@ else {
$i++;
}
if (in_array('owner_user',$show_fields)) {
if ($fields == 'owner_user') {
$owner_name = db_get_value('fullname', 'tusuario', 'id_user', $event['owner_user']);
if(empty($owner_name)) {
$owner_name = $event['owner_user'];
@ -583,7 +585,7 @@ else {
$i++;
}
if (in_array('id_grupo',$show_fields)) {
if ($fields == 'id_grupo') {
if ($meta) {
$data[$i] = $event['group_name'];
}
@ -599,13 +601,13 @@ else {
$i++;
}
if (in_array('event_type',$show_fields)) {
if ($fields == 'event_type') {
$data[$i] = events_print_type_description($event["event_type"], true);
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('id_agentmodule',$show_fields)) {
if ($fields == 'id_agentmodule') {
if ($meta) {
$module_link = '<a href="'.$event["server_url"].'/index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
if (can_user_access_node ()) {
@ -624,7 +626,7 @@ else {
$i++;
}
if (in_array('id_alert_am',$show_fields)) {
if ($fields == 'id_alert_am') {
if($meta) {
$data[$i] = $event["alert_template_name"];
}
@ -647,13 +649,13 @@ else {
$i++;
}
if (in_array('criticity',$show_fields)) {
if ($fields == 'criticity') {
$data[$i] = get_priority_name ($event["criticity"]);
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('user_comment',$show_fields)) {
if ($fields == 'user_comment') {
$safe_event_user_comment = strip_tags(io_safe_output($event["user_comment"]));
$line_breaks = array("\r\n", "\n", "\r");
$safe_event_user_comment = str_replace($line_breaks, '<br>', $safe_event_user_comment);
@ -684,25 +686,25 @@ else {
$i++;
}
if (in_array('tags',$show_fields)) {
if ($fields == 'tags') {
$data[$i] = tags_get_tags_formatted($event['tags']);
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('source',$show_fields)) {
if ($fields == 'source') {
$data[$i] = $event["source"];
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('id_extra',$show_fields)) {
if ($fields == 'id_extra') {
$data[$i] = $event["id_extra"];
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('ack_utimestamp',$show_fields)) {
if ($fields == 'ack_utimestamp') {
if ($event["ack_utimestamp"] == 0) {
$data[$i] = '';
}
@ -713,7 +715,7 @@ else {
$i++;
}
if (in_array('instructions',$show_fields)) {
if ($fields == 'instructions') {
switch($event['event_type']) {
case 'going_unknown':
if(!empty($event["unknown_instructions"])) {
@ -751,7 +753,7 @@ else {
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('data',$show_fields)) {
if ($fields == 'data') {
$data[$i] = $event["data"];
if($data[$i] %1 == 0)
$data[$i]= number_format($data[$i], 0);
@ -760,11 +762,12 @@ else {
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if (in_array('module_status',$show_fields)) {
if ($fields == 'module_status') {
$data[$i] = modules_get_modules_status ($event["module_status"]);
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
}
if ($i != 0 && $allow_action) {
//Actions