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

#12633 Fixed Acknowledged

Browse Source
This commit is contained in:
Daniel Maya 2023-12-12 12:45:13 +01:00
parent f5a455aa15
commit 90c91f67fa
1 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pandora_console/include/functions_events.php
View File

@ -5039,7 +5039,11 @@ function events_page_general($event)
$data[1] = $user_owner; $data[1] = $user_owner;
} }
$table_general->cellclass[3][1] = 'general_owner'; if (is_metaconsole() === true && $event['server_name'] !== '') {
$table_general->cellclass[4][1] = 'general_owner';
} else {
$table_general->cellclass[3][1] = 'general_owner';
}
$table_general->data[] = $data; $table_general->data[] = $data;
@ -5100,38 +5104,7 @@ function events_page_general($event)
$data = []; $data = [];
$data[0] = __('Acknowledged by'); $data[0] = __('Acknowledged by');
$data[1] = events_page_general_acknowledged($event['id_evento']);
if ($event['estado'] == 1 || $event['estado'] == 2) {
if (empty($event['id_usuario']) === true) {
$user_ack = __('Autovalidated');
} else {
$user_ack = db_get_value(
'fullname',
'tusuario',
'id_user',
$event['id_usuario']
);
if (empty($user_ack) === true) {
$user_ack = $event['id_usuario'];
}
}
$data[1] = $user_ack.' ( ';
if ($event['ack_utimestamp_raw'] !== false
&& $event['ack_utimestamp_raw'] !== 'false'
&& empty($event['ack_utimestamp_raw']) === false
) {
$data[1] .= date(
$config['date_format'],
$event['ack_utimestamp_raw']
);
}
$data[1] .= ' ) ';
} else {
$data[1] = '<i>'.__('N/A').'</i>';
}
$table_general->cellclass[7][1] = 'general_status'; $table_general->cellclass[7][1] = 'general_status';
@ -5237,15 +5210,19 @@ function events_page_general_acknowledged($event_id)
$Acknowledged = ''; $Acknowledged = '';
$event = db_get_row('tevento', 'id_evento', $event_id); $event = db_get_row('tevento', 'id_evento', $event_id);
if ($event !== false && ($event['estado'] == 1 || $event['estado'] == 2)) { if ($event !== false && ($event['estado'] == 1 || $event['estado'] == 2)) {
$user_ack = db_get_value( if (empty($event['id_usuario']) === true) {
'fullname', $user_ack = __('Autovalidated');
'tusuario', } else {
'id_user', $user_ack = db_get_value(
$config['id_user'] 'fullname',
); 'tusuario',
'id_user',
$config['id_user']
);
if (empty($user_ack) === true) { if (empty($user_ack) === true) {
$user_ack = $config['id_user']; $user_ack = $config['id_user'];
}
} }
$Acknowledged = $user_ack.'&nbsp;(&nbsp;'; $Acknowledged = $user_ack.'&nbsp;(&nbsp;';
@ -5260,7 +5237,7 @@ function events_page_general_acknowledged($event_id)
$Acknowledged .= '&nbsp;)&nbsp;'; $Acknowledged .= '&nbsp;)&nbsp;';
} else { } else {
$Acknowledged = 'N/A'; $Acknowledged = '<i>'.__('N/A').'</i>';
} }
return $Acknowledged; return $Acknowledged;