From 50e8b457f8d2ae1d0bece5a83937550f393ae8a3 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Thu, 9 Feb 2023 11:42:42 +0100
Subject: [PATCH 1/2] #10302 fixed tz in event list

---
 pandora_console/operation/events/events.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 6777ced4c3..c7c8be45ce 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -350,7 +350,7 @@ if (is_ajax() === true) {
                 'te.warning_instructions',
                 'te.unknown_instructions',
                 'te.owner_user',
-                'if(te.ack_utimestamp > 0, from_unixtime(te.ack_utimestamp),"") as ack_utimestamp',
+                'if(te.ack_utimestamp > 0, te.ack_utimestamp,"") as ack_utimestamp',
                 'te.custom_data',
                 'te.data',
                 'te.module_status',
@@ -380,7 +380,7 @@ if (is_ajax() === true) {
                             $order['field'] = 'agent_name';
                         break;
 
-                        case 'if(te.ack_utimestamp > 0, from_unixtime(te.ack_utimestamp),"") as ack_utimestamp':
+                        case 'if(te.ack_utimestamp > 0, te.ack_utimestamp,"") as ack_utimestamp':
                             $order['field'] = 'ack_utimestamp';
                         break;
 
@@ -528,7 +528,7 @@ if (is_ajax() === true) {
                             true
                         );
                         $tmp->timestamp = ui_print_timestamp(
-                            $tmp->timestamp,
+                            $tmp->utimestamp,
                             true
                         );
 

From 3d5458ae4623d332d7cb38cd4ec9650e31fcfd56 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 22 Feb 2023 11:36:09 +0100
Subject: [PATCH 2/2] #10302 fixed ack date

---
 pandora_console/operation/events/events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index c7c8be45ce..251d95200d 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -521,7 +521,7 @@ if (is_ajax() === true) {
 
                         $tmp->agent_name = io_safe_output($tmp->agent_name);
 
-                        $tmp->ack_utimestamp_raw = strtotime($tmp->ack_utimestamp);
+                        $tmp->ack_utimestamp_raw = $tmp->ack_utimestamp;
 
                         $tmp->ack_utimestamp = ui_print_timestamp(
                             (empty($tmp->ack_utimestamp) === true) ? 0 : $tmp->ack_utimestamp,