diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix date-time conditions to respect domain timezone by converting to/from UTC (#7728)

Browse Source 
Fixes date-time conditions to properly convert between the domain timezone and UTC.

Issue:
Date-time conditions triggered at the wrong times because FreeSWITCH evaluates them in UTC, but the user input was not being converted.

Solution:
    Convert user timezone → UTC when saving
    Convert UTC → user timezone when displaying
    Use settings object cascading for timezone (user → domain → global → default)
    Handle both 12h and 24h formats

Testing:
Set time condition for 9:00 AM in America/New_York timezone - should trigger at 9:00 AM local time, not UTC.
This commit is contained in:
Mendel
2026-04-13 12:43:02 -04:00
committed by GitHub
parent 24c99ab4ef
commit 7f09914d27
1 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/time_conditions/time_condition_edit.php
+44 -10
View File
@@ -304,12 +304,26 @@
$cond_start = $_REQUEST['value'][$group_id][$cond_num]['start'];
$cond_stop = $_REQUEST['value'][$group_id][$cond_num]['stop'];
//convert to 24 hour time
if (!empty($cond_start) && $cond_var == 'date-time' && $settings->get('domain', 'time_format') != '24h') {
$cond_start = DateTime::createFromFormat('Y-m-d h:i a', $cond_start)->format('Y-m-d H:i');
//convert to 24 hour time and UTC for date-time conditions (FreeSWITCH evaluates date-time in UTC)
if (!empty($cond_start) && $cond_var == 'date-time') {
$format = $settings->get('domain', 'time_format') == '24h' ? 'Y-m-d H:i' : 'Y-m-d h:i a';
$user_timezone = $settings->get('domain', 'time_zone', date_default_timezone_get());
$dt = DateTime::createFromFormat($format, $cond_start, new DateTimeZone($user_timezone));
if ($dt !== false) {
$dt->setTimezone(new DateTimeZone('UTC'));
$cond_start = $dt->format('Y-m-d H:i');
}
}
if (!empty($cond_stop) && $cond_var == 'date-time' && $settings->get('domain', 'time_format') != '24h') {
$cond_stop = DateTime::createFromFormat('Y-m-d h:i a', $cond_stop)->format('Y-m-d H:i');
if (!empty($cond_stop) && $cond_var == 'date-time') {
$format = $settings->get('domain', 'time_format') == '24h' ? 'Y-m-d H:i' : 'Y-m-d h:i a';
$user_timezone = $settings->get('domain', 'time_zone', date_default_timezone_get());
$dt = DateTime::createFromFormat($format, $cond_stop, new DateTimeZone($user_timezone));
if ($dt !== false) {
$dt->setTimezone(new DateTimeZone('UTC'));
$cond_stop = $dt->format('Y-m-d H:i');
}
}
//Use date-time to set the year, month, day and time
@@ -390,7 +404,6 @@
$cond_stop = ($array_cond_stop[0] * 60) + $array_cond_stop[1];
}
}
$cond_value = $cond_start;
if ($cond_stop != '') {
$range_indicator = ($cond_var == 'date-time') ? '~' : '-';
@@ -1149,11 +1162,32 @@ if ($action == 'update') {
if ($cond_var == 'date-time') {
echo " change_to_input(document.getElementById('value_".$group_id."_' + condition_id + '_start'));\n";
echo " change_to_input(document.getElementById('value_".$group_id."_' + condition_id + '_stop'));\n";
//convert to 12 hour time if needed
if ($settings->get('domain', 'time_format') != '24h') {
$cond_val_start = DateTime::createFromFormat('Y-m-d H:i', $cond_val_start)->format('Y-m-d h:i a');
$cond_val_stop = DateTime::createFromFormat('Y-m-d H:i', $cond_val_stop)->format('Y-m-d h:i a');
//convert from UTC to user timezone and format appropriately
$user_timezone = $settings->get('domain', 'time_zone', date_default_timezone_get());
$dt_start = DateTime::createFromFormat('Y-m-d H:i', $cond_val_start, new DateTimeZone('UTC'));
if ($dt_start !== false) {
$dt_start->setTimezone(new DateTimeZone($user_timezone));
if ($settings->get('domain', 'time_format') != '24h') {
$cond_val_start = $dt_start->format('Y-m-d h:i a');
} else {
$cond_val_start = $dt_start->format('Y-m-d H:i');
}
}
if (!empty($cond_val_stop)) {
$dt_stop = DateTime::createFromFormat('Y-m-d H:i', $cond_val_stop, new DateTimeZone('UTC'));
if ($dt_stop !== false) {
$dt_stop->setTimezone(new DateTimeZone($user_timezone));
if ($settings->get('domain', 'time_format') != '24h') {
$cond_val_stop = $dt_stop->format('Y-m-d h:i a');
} else {
$cond_val_stop = $dt_stop->format('Y-m-d H:i');
}
}
}
echo " $('#value_".$group_id."_' + condition_id + '_start').val('".$cond_val_start."');\n";
echo " $('#value_".$group_id."_' + condition_id + '_stop').val('".$cond_val_stop."');\n";
}