Skip to content

Commit dfa6839

Browse files
committed
Save UTC time to fix delayed scheduled message sending
1 parent cfab9e2 commit dfa6839

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

modules/core/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ function get_scheduled_date($format, $only_label = false) {
673673
return [$label, date('D, H:i', $time)];
674674
}
675675

676-
return date('D, d M Y H:i', $time);
676+
return date('D, d M Y H:i T', $time);
677677
}
678678
}
679679

modules/core/site.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,8 +2425,9 @@ function setupActionSchedule(callback) {
24252425
}
24262426
});
24272427
$(document).on('change', '.nexter_input_date', function (e) {
2428-
if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
2429-
$('.nexter_input').val($(this).val()).trigger('change');
2428+
const selectedDate = new Date($(this).val());
2429+
if ($(this).val() && new Date().getTime() < selectedDate.getTime()) {
2430+
$('.nexter_input').val(selectedDate.toISOString()).trigger('change');
24302431
}
24312432
});
24322433
$(document).on('change', '.nexter_input', callback);
@@ -2451,8 +2452,9 @@ function setupActionSnooze(callback) {
24512452
}
24522453
});
24532454
$(document).on('change', '.nexter_input_date_snooze', function (e) {
2454-
if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
2455-
$('.nexter_input_snooze').val($(this).val()).trigger('change');
2455+
const selectedDate = new Date($(this).val());
2456+
if ($(this).val() && new Date().getTime() < selectedDate.getTime()) {
2457+
$('.nexter_input_snooze').val(selectedDate.toISOString()).trigger('change');
24562458
}
24572459
});
24582460
$(document).on('change', '.nexter_input_snooze', callback);

modules/smtp/functions.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ function send_scheduled_message($handler, $imapMailbox, $folder, $msg_id, $send_
8585
}
8686
$profile = $profiles[0];
8787
}
88-
$smtpConfig = Hm_SMTP_List::dumpForMailbox($profile['smtp_id']);
89-
$smtpMailbox = new Hm_Mailbox($profile['smtp_id'], $handler->user_config, $handler->session, $smtpConfig);
90-
88+
$smtpMailbox = Hm_SMTP_List::connect($profile['smtp_id'], false);
9189
if (! $smtpMailbox->authed()) {
9290
Hm_Msgs::add("ERRFailed to authenticate to the SMTP server");
9391
return;

modules/smtp/modules.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ public function process() {
15761576

15771577
foreach ($servers as $server_id => $config) {
15781578
$mailbox = new Hm_Mailbox($server_id, $this->user_config, $this->session, $config);
1579-
if ($mailbox->authed()) {
1579+
if ($mailbox->connect()) {
15801580
$folder = 'Scheduled';
15811581
$ret = $mailbox->get_messages($folder, 'DATE', false, 'ALL');
15821582
foreach ($ret[1] as $msg) {
@@ -1621,7 +1621,7 @@ public function process() {
16211621
$imap_server = Hm_IMAP_List::getForMailbox($imap_server_id);
16221622

16231623
$mailbox = new Hm_Mailbox($imap_server_id, $this->user_config, $this->session, $imap_server);
1624-
if ($mailbox->authed()) {
1624+
if ($mailbox->connect()) {
16251625
$folder = hex2bin($folder);
16261626
if (reschedule_message_sending($this, $mailbox, $msg_id, $folder, $new_schedule_date)) {
16271627
$scheduled_msg_count++;
@@ -2047,7 +2047,7 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
20472047
return -1;
20482048
}
20492049
$mailbox = new Hm_Mailbox($imap_profile['id'], $mod->user_config, $session, $imap_profile);
2050-
if (! $mailbox->authed()) {
2050+
if (! $mailbox->connect()) {
20512051
return -1;
20522052
}
20532053

0 commit comments

Comments
 (0)