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

Merge branch 'ent-12677-corregir-timezone-en-eventos' into 'develop' 

fix timezone events pandora_enterprise#12677

See merge request artica/pandorafms!6796
This commit is contained in:
Rafael Ameijeiras 2024-01-19 08:38:39 +00:00
parent 7caabd9805 1b034d696c
commit 6e9a367d05
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/operation/events/events.php
View File

@ -641,32 +641,17 @@ if (is_ajax() === true) {
} }
if (empty($user_timezone) === true) { if (empty($user_timezone) === true) {
if (date_default_timezone_get() !== $config['timezone']) { $user_timezone = $config['timezone'];
$timezone = timezone_open(date_default_timezone_get()); if (empty($user_timezone) === true) {
$datetime_eur = date_create('now', timezone_open($config['timezone'])); $user_timezone = date_default_timezone_get();
$dif = timezone_offset_get($timezone, $datetime_eur);
date($config['date_format'], $dif);
if (!date('I')) {
// For summer -3600sec.
$dif -= 3600;
}
$total_sec = strtotime($tmp->timestamp);
$total_sec += $dif;
$last_contact = date($config['date_format'], $total_sec);
$last_contact_value = ui_print_timestamp($last_contact, true, $options);
} else {
$title = date($config['date_format'], strtotime($tmp->timestamp));
$value = ui_print_timestamp(strtotime($tmp->timestamp), true, $options);
$last_contact_value = '<span title="'.$title.'">'.$value.'</span>';
} }
} else {
date_default_timezone_set($user_timezone);
$title = date($config['date_format'], strtotime($tmp->timestamp));
$value = ui_print_timestamp(strtotime($tmp->timestamp), true, $options);
$last_contact_value = '<span title="'.$title.'">'.$value.'</span>';
} }
date_default_timezone_set($user_timezone);
$title = date($config['date_format'], $tmp->utimestamp);
$value = ui_print_timestamp($tmp->utimestamp, true, $options);
$last_contact_value = '<span title="'.$title.'">'.$value.'</span>';
$tmp->timestamp = $last_contact_value; $tmp->timestamp = $last_contact_value;
if (is_numeric($tmp->data) === true) { if (is_numeric($tmp->data) === true) {