Skip to content

Respect time zone for scheduled sending #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tbsschmdt wants to merge 1 commit into
base: v13.1
Choose a base branch
from
+7 −2
Open

Respect time zone for scheduled sending #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Classes/Module/DmailController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,8 @@ protected function sendMail($row): void
$result = $this->cmd_compileMailGroup($recipientGroups);
$queryInfo = $result['queryInfo'];

$distributionTime = strtotime($this->sendMailDatetimeHr);
// Respect time zone here because the JavaScript date picker cannot do that
$distributionTime = (int)(new \DateTime($this->sendMailDatetimeHr))->format('U') - (int)(new \DateTime())->format('Z');
if ($distributionTime < time()) {
$distributionTime = time();
}
Expand Down Expand Up @@ -1473,8 +1474,12 @@ protected function cmd_finalmail(array $direct_mail_row): array
);
$this->flashMessageQueue->addMessage($message);
}

// Respect time zone here because the JavaScript date picker cannot do that
$adjustedSendMailDateTime = (int)(new \DateTime())->format('U') + (int)(new \DateTime())->format('Z');
// flatpickr parses the field value as ISO8601, a localised string makes it throw.
$sendMailDatetime = $this->sendMailDatetimeHr ?: (new \DateTime())->format('c');
$sendMailDatetime = $this->sendMailDatetimeHr ?: gmdate('c', $adjustedSendMailDateTime);

return [
'id' => $this->id,
'sys_dmail_uid' => $this->sys_dmail_uid,
Expand Down