refactor: Improve handling of server timezones in scheduled backups and tasks

This commit is contained in:
Andras Bacsai 2024-09-06 16:42:12 +02:00
parent a9228b110e
commit a2dac9394a

View file

@ -137,7 +137,12 @@ private function check_scheduled_backups($schedule)
}
$server = $scheduled_backup->server();
$serverTimezone = $server->settings->server_timezone;
if (! $server) {
$serverTimezone = config('app.timezone');
} else {
$serverTimezone = $server->settings->server_timezone;
}
if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
$scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
@ -179,7 +184,11 @@ private function check_scheduled_tasks($schedule)
}
$server = $scheduled_task->server();
$serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
if (! $server) {
$serverTimezone = config('app.timezone');
} else {
$serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
}
if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
$scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];