diff --git a/language/az.php b/language/az.php
index 5e1c54a187..e3f91e1ced 100755
--- a/language/az.php
+++ b/language/az.php
@@ -621,6 +621,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/de.php b/language/de.php
index 7150e9c182..8bd66b1a43 100755
--- a/language/de.php
+++ b/language/de.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/en.php b/language/en.php
index f630f6a2d3..7dcf4bcccd 100755
--- a/language/en.php
+++ b/language/en.php
@@ -636,6 +636,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
@@ -645,7 +646,6 @@
'Are you sure you want to send this message?' => false,
'IMAP and JMAP Servers' => false,
'Junk' => false,
- 'Trash' => false,
'Pasted text has leading or trailing spaces' => false,
'No tags available yet.' => false,
'Server capabilities' => false,
diff --git a/language/es.php b/language/es.php
index fa551b1ea9..c253b1f363 100755
--- a/language/es.php
+++ b/language/es.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/et.php b/language/et.php
index 61b7b6addb..53e6207a9f 100755
--- a/language/et.php
+++ b/language/et.php
@@ -626,6 +626,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/fa.php b/language/fa.php
index b2ad0e2221..7a7b5ee481 100755
--- a/language/fa.php
+++ b/language/fa.php
@@ -670,6 +670,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
@@ -679,7 +680,6 @@
'Are you sure you want to send this message?' => false,
'IMAP and JMAP Servers' => false,
'Junk' => false,
- 'Trash' => false,
'Pasted text has leading or trailing spaces' => false,
'No tags available yet.' => false,
'Server capabilities' => false,
diff --git a/language/fr.php b/language/fr.php
index b60c7c3592..eb7a176afe 100755
--- a/language/fr.php
+++ b/language/fr.php
@@ -617,6 +617,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/hu.php b/language/hu.php
index e91cd6a66d..7e9b587059 100755
--- a/language/hu.php
+++ b/language/hu.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/id.php b/language/id.php
index 07b205ab8b..95c4ac6a5f 100755
--- a/language/id.php
+++ b/language/id.php
@@ -625,6 +625,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/it.php b/language/it.php
index 5147b4e8ad..d720e4214a 100755
--- a/language/it.php
+++ b/language/it.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/ja.php b/language/ja.php
index 30596c066d..7c7d601ac5 100755
--- a/language/ja.php
+++ b/language/ja.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/nl.php b/language/nl.php
index 1d1db295cc..82e94158d6 100755
--- a/language/nl.php
+++ b/language/nl.php
@@ -618,6 +618,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/pt-BR.php b/language/pt-BR.php
index 1fcf9142ec..7ad23625b8 100755
--- a/language/pt-BR.php
+++ b/language/pt-BR.php
@@ -617,6 +617,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/ro.php b/language/ro.php
index 5a52506d25..c019b88263 100755
--- a/language/ro.php
+++ b/language/ro.php
@@ -617,6 +617,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/ru.php b/language/ru.php
index 60813edac2..70cd16aa1c 100755
--- a/language/ru.php
+++ b/language/ru.php
@@ -619,6 +619,7 @@
'You must provide a name for your script' => false,
'Empty script' => false,
'Please create a profile for saving sent messages option' => false,
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => false,
'Your subject is empty!' => false,
'Your body is empty!' => false,
diff --git a/language/zh-Hans.php b/language/zh-Hans.php
index 8baf2310ff..526e932c4a 100644
--- a/language/zh-Hans.php
+++ b/language/zh-Hans.php
@@ -639,6 +639,7 @@
'You must provide a name for your script' => '请提供脚本名称',
'Empty script' => '空脚本',
'Please create a profile for saving sent messages option' => '请创建用于保存已发送信息选项的配置文件',
+ 'You have %d scheduled messages that won\'t be executed if you quit' => false,
'Attachment storage unavailable, please contact your site administrator' => '附件存储不可用，请联系您的网站管理员',
'Your subject is empty!' => '主题为空！',
'Your body is empty!' => '内容为空！',
diff --git a/modules/core/functions.php b/modules/core/functions.php
index 9ade1c45e6..a6cb933c63 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -622,3 +622,99 @@ function check_file_upload($request, $key) {
}
return true;
}}
+
+if (!hm_exists('get_nexter_date')) {
+function get_nexter_date($format, $only_label = false) {
+ if ($format == 'later_in_day') {
+ $date_string = 'today 18:00';
+ $label = 'Later in the day';
+ } elseif ($format == 'tomorrow') {
+ $date_string = '+1 day 08:00';
+ $label = 'Tomorrow';
+ } elseif ($format == 'next_weekend') {
+ $date_string = 'next Saturday 08:00';
+ $label = 'Next weekend';
+ } elseif ($format == 'next_week') {
+ $date_string = 'next week 08:00';
+ $label = 'Next week';
+ } elseif ($format == 'next_month') {
+ $date_string = 'next month 08:00';
+ $label = 'Next month';
+ } else {
+ $date_string = $format;
+ $label = 'Certain date';
+ }
+ $time = strtotime($date_string);
+ if ($only_label) {
+ return [$label, date('D, H:i', $time)];
+ }
+ return date('D, d M Y H:i', $time);
+}}
+
+/**
+ * @subpackage imap/functions
+ */
+if (!hm_exists('nexter_formats')) {
+function nexter_formats() {
+ $values = array(
+ 'tomorrow',
+ 'next_weekend',
+ 'next_week',
+ 'next_month'
+ );
+ if (date('H') <= 16) {
+ array_push($values, 'later_in_day');
+ }
+ return $values;
+}}
+
+if (!hm_exists('schedule_dropdown')) {
+function schedule_dropdown($output, $send_now = false) {
+ $values = nexter_formats();
+
+ $txt = '';
+ if ($send_now) {
+ $txt .= '
+ ';
+ }
+ $txt .= '';
+ if ($send_now) {
+ $txt .= '
';
+ }
+
+ return $txt;
+}}
+
+/**
+ * @subpackage imap/functions
+ */
+if (!hm_exists('parse_nexter_header')) {
+ function parse_nexter_header($header, $name)
+ {
+ $header = str_replace("$name: ", '', $header);
+ $result = [];
+ foreach (explode(';', $header) as $kv)
+ {
+ $kv = trim($kv);
+ $spacePos = strpos($kv, ' ');
+ if ($spacePos > 0) {
+ $result[rtrim(substr($kv, 0, $spacePos), ':')] = trim(substr($kv, $spacePos+1));
+ } else {
+ $result[$kv] = true;
+ }
+ }
+ return $result;
+ }}
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index eac7e95a2f..368aa70098 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -316,11 +316,11 @@ function subject_callback($vals, $style, $output_mod) {
*/
if (!hm_exists('date_callback')) {
function date_callback($vals, $style, $output_mod) {
- $snooze_class = isset($vals[2]) && $vals[2]? ' snoozed_date': '';
+ $nexter_class = isset($vals[2]) && $vals[2]? ' nexter_date': '';
if ($style == 'news') {
- return sprintf('%s
', $snooze_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+ return sprintf('%s
', $nexter_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
}
- return sprintf('%s ', $snooze_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+ return sprintf('%s ', $nexter_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
}}
/**
diff --git a/modules/core/site.css b/modules/core/site.css
index 9cd5d27de7..393b38abfe 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -1269,7 +1269,7 @@ div.unseen,
.mobile .imap_sort {
width: 100%;
}
-.snoozed_date {
+.nexter_date {
color: var(--bs-primary) !important;
}
diff --git a/modules/core/site.js b/modules/core/site.js
index e44c6ab047..9617ef0321 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1931,10 +1931,23 @@ var imap_smtp_edit_action = function(event) {
}
};
+
var hasLeadingOrTrailingSpaces = function(str) {
return str !== str.trim();
};
+var sprintf = function(format, ...args) {
+ let i = 0;
+ return format.replace(/%([sd])/g, (match, type) => {
+ let arg = args[i++];
+ switch (type) {
+ case 's': return String(arg);
+ case 'd': return Number(arg);
+ default: return match;
+ }
+ });
+}
+
/* create a default message list object */
var Hm_Message_List = new Message_List();
@@ -1967,7 +1980,7 @@ $(function() {
/* fire up the job scheduler */
Hm_Timer.fire();
-
+
/* show any pending notices */
Hm_Utils.show_sys_messages();
@@ -1997,7 +2010,7 @@ $(function() {
}
if (hm_page_name() == 'servers') {
$('.edit_server_connection').on('click', imap_smtp_edit_action);
- }
+ }
if (hm_mobile()) {
swipe_event(document.body, function() { Hm_Folders.open_folder_list(); }, 'right');
swipe_event(document.body, function() { Hm_Folders.hide_folder_list(); }, 'left');
@@ -2356,7 +2369,7 @@ function handleSmtpImapCheckboxChange(checkbox) {
if ($('#srv_setup_stepper_is_sender').prop('checked') && $('#srv_setup_stepper_is_receiver').prop('checked')) {
$('#srv_setup_stepper_profile_bloc').show();
$('#srv_setup_stepper_profile_checkbox_bloc').show();
-
+
} else if(! $('#srv_setup_stepper_is_sender').prop('checked') || ! $('#srv_setup_stepper_is_receiver').prop('checked')) {
$('#srv_setup_stepper_profile_bloc').hide();
$('#srv_setup_stepper_profile_checkbox_bloc').hide();
@@ -2408,7 +2421,7 @@ function display_config_step(stepNumber) {
$(`#${item.key}-error`).text('Required');
isValid = false;
}
-
+
} else {
$(`#${item.key}-error`).text('');
}
@@ -2686,7 +2699,7 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
if (mutation.addedNodes.length > 0) {
mutation.addedNodes.forEach(function (node) {
if (node.classList.contains('msg_text_inner')) {
- handleExternalResources(inline);
+ handleExternalResources(inline);
}
});
}
@@ -2696,3 +2709,29 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
});
}
};
+
+var setup_nexter_date = function(callback) {
+ $(document).on('click', '.nexter_date_picker', function(e) {
+ document.querySelector('.nexter_input_date').showPicker();
+ });
+ $(document).on('click', '.nexter_date_helper', function(e) {
+ e.preventDefault();
+ $('.nexter_input').val($(this).attr('data-value')).trigger('change');
+ });
+ $(document).on('input', '.nexter_input_date', function(e) {
+ var now = new Date();
+ now.setMinutes(now.getMinutes() + 1);
+ $(this).attr('min', now.toJSON().slice(0, 16));
+ if (new Date($(this).val()).getTime() <= now.getTime()) {
+ $('.nexter_date_picker').css('border', '1px solid red');
+ } else {
+ $('.nexter_date_picker').css({'border': 'unset', 'border-top': '1px solid #ddd'});
+ }
+ });
+ $(document).on('change', '.nexter_input_date', function(e) {
+ if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
+ $('.nexter_input').val($(this).val()).trigger('change');
+ }
+ });
+ $(document).on('change', '.nexter_input', callback);
+}
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 2b5904baf7..ba88c5da58 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -230,10 +230,14 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
$nofrom = ' nofrom';
}
$is_snoozed = !empty($msg['x_snoozed']) && hex2bin($msg['folder']) == 'Snoozed';
+ $is_scheduled = !empty($msg['x_schedule']) && hex2bin($msg['folder']) == 'Scheduled';
if ($is_snoozed) {
- $snooze_header = parse_snooze_header('X-Snoozed: '.$msg['x_snoozed']);
+ $snooze_header = parse_nexter_header('X-Snoozed: '.$msg['x_snoozed'], 'X-Snoozed');
$date = $snooze_header['until'];
$timestamp = strtotime($date);
+ } elseif ($is_scheduled) {
+ $date = $msg['x_schedule'];
+ $timestamp = strtotime($date);
} else {
if ($list_sort == 'date') {
$date_field = 'date';
@@ -308,7 +312,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
array('safe_output_callback', 'source', $source, $icon),
array('safe_output_callback', 'from'.$nofrom, $from, null, str_replace(array($from, '<', '>'), '', $msg['from'])),
array('subject_callback', $subject, $url, $flags),
- array('date_callback', $date, $timestamp, $is_snoozed),
+ array('date_callback', $date, $timestamp, $is_snoozed || $is_scheduled),
array('icon_callback', $flags)
),
$id,
@@ -1293,7 +1297,7 @@ function snooze_message($imap, $msg_id, $folder, $snooze_tag) {
preg_match("/^X-Snoozed:.*(\r?\n[ \t]+.*)*\r?\n?/im", $msg, $matches);
if (count($matches)) {
$msg = str_replace($matches[0], '', $msg);
- $old_folder = parse_snooze_header($matches[0])['from'];
+ $old_folder = parse_nexter_header($matches[0], 'X-Snoozed')['from'];
}
if ($snooze_tag) {
$from = $old_folder ?? $folder;
@@ -1319,7 +1323,7 @@ function snooze_message($imap, $msg_id, $folder, $snooze_tag) {
}
}
} else {
- $snooze_headers = parse_snooze_header($matches[0]);
+ $snooze_headers = parse_nexter_header($matches[0], 'X-Snoozed');
$original_folder = $snooze_headers['from'];
if ($imap->select_mailbox($original_folder) && $imap->append_start($original_folder, mb_strlen($msg))) {
$imap->append_feed($msg."\r\n");
@@ -1446,21 +1450,21 @@ function snooze_formats() {
*/
if (!hm_exists('snooze_dropdown')) {
function snooze_dropdown($output, $unsnooze = false) {
- $values = snooze_formats();
+ $values = nexter_formats();
$txt = '
-
-
';
@@ -1594,3 +1598,42 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
}
}
}
+
+if (!hm_exists('save_sent_msg')) {
+function save_sent_msg($handler, $imap_id, $imap, $imap_details, $msg, $msg_id, $show_errors = true) {
+ $specials = get_special_folders($handler, $imap_id);
+ if (array_key_exists('sent', $specials) && $specials['sent']) {
+ $sent_folder = $specials['sent'];
+ }
+
+ if (!$sent_folder) {
+ $auto_sent = $imap->get_special_use_mailboxes('sent');
+ if (!array_key_exists('sent', $auto_sent)) {
+ return;
+ }
+ $sent_folder = $auto_sent['sent'];
+ }
+ if (!$sent_folder) {
+ Hm_Debug::add(sprintf("Unable to save sent message, no sent folder for IMAP %s", $imap_details['server']));
+ }
+ $uid = null;
+ if ($sent_folder) {
+ Hm_Debug::add(sprintf("Attempting to save sent message for IMAP server %s in folder %s", $imap_details['server'], $sent_folder));
+ if ($imap->append_start($sent_folder, strlen($msg), true)) {
+ $imap->append_feed($msg."\r\n");
+ if (!$imap->append_end() && $show_errors) {
+ Hm_Msgs::add('ERRAn error occurred saving the sent message');
+ }
+ }
+
+ $mailbox_page = $imap->get_mailbox_page($sent_folder, 'ARRIVAL', true, 'ALL', 0, 10);
+ foreach ($mailbox_page[1] as $mail) {
+ $msg_header = $imap->get_message_headers($mail['uid']);
+ if ($msg_header['Message-Id'] === $msg_id) {
+ $uid = $mail['uid'];
+ break;
+ }
+ }
+ }
+ return $uid;
+}}
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 9008f4e99a..4e2c2783a1 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -367,6 +367,9 @@ public function process() {
break;
}
}
+ }
+ $uid = save_sent_msg($this, $imap_id, $imap, $imap_details, $msg, $mime->get_headers()['Message-Id']);
+ if ($uid) {
if ($uid && $this->user_config->get('review_sent_email_setting', false)) {
$this->out('redirect_url', '?page=message&uid='.$uid.'&list_path=imap_'.$imap_id.'_'.bin2hex($sent_folder));
}
@@ -1059,7 +1062,7 @@ public function process() {
$snooze_tag = null;
if ($form['imap_snooze_until'] != 'unsnooze') {
$at = date('D, d M Y H:i:s O');
- $until = get_snooze_date($form['imap_snooze_until']);
+ $until = get_nexter_date($form['imap_snooze_until']);
$snooze_tag = "X-Snoozed: at $at; until $until";
}
$ids = explode(',', $form['imap_snooze_ids']);
@@ -1149,7 +1152,7 @@ public function process() {
$msg_headers = $imap->get_message_headers($msg['uid']);
if (isset($msg_headers['X-Snoozed'])) {
try {
- $snooze_headers = parse_snooze_header($msg_headers['X-Snoozed']);
+ $snooze_headers = parse_nexter_header($msg_headers['X-Snoozed'], 'X-Snoozed');
if (new DateTime($snooze_headers['until']) <= new DateTime()) {
snooze_message($imap, $msg['uid'], $folder, null);
}
diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
index 26fb8cfe78..b45e2d4b79 100644
--- a/modules/imap/hm-imap.php
+++ b/modules/imap/hm-imap.php
@@ -776,7 +776,7 @@ public function get_message_list($uids, $raw=false) {
if ($this->is_supported( 'X-GM-EXT-1' )) {
$command .= 'X-GM-MSGID X-GM-THRID X-GM-LABELS ';
}
- $command .= "BODY.PEEK[HEADER.FIELDS (SUBJECT X-AUTO-BCC FROM DATE CONTENT-TYPE X-PRIORITY TO LIST-ARCHIVE REFERENCES MESSAGE-ID X-SNOOZED)])\r\n";
+ $command .= "BODY.PEEK[HEADER.FIELDS (SUBJECT X-AUTO-BCC FROM DATE CONTENT-TYPE X-PRIORITY TO LIST-ARCHIVE REFERENCES MESSAGE-ID X-SNOOZED X-SCHEDULE X-PROFILE-ID X-DELIVERY)])\r\n";
$cache_command = $command.(string)$raw;
$cache = $this->check_cache($cache_command);
if ($cache !== false) {
@@ -786,8 +786,8 @@ public function get_message_list($uids, $raw=false) {
$res = $this->get_response(false, true);
$status = $this->check_response($res, true);
$tags = array('X-GM-MSGID' => 'google_msg_id', 'X-GM-THRID' => 'google_thread_id', 'X-GM-LABELS' => 'google_labels', 'UID' => 'uid', 'FLAGS' => 'flags', 'RFC822.SIZE' => 'size', 'INTERNALDATE' => 'internal_date');
- $junk = array('X-AUTO-BCC', 'MESSAGE-ID', 'REFERENCES', 'X-SNOOZED', 'LIST-ARCHIVE', 'SUBJECT', 'FROM', 'CONTENT-TYPE', 'TO', '(', ')', ']', 'X-PRIORITY', 'DATE');
- $flds = array('x-auto-bcc' => 'x_auto_bcc', 'message-id' => 'message_id', 'references' => 'references', 'x-snoozed' => 'x_snoozed', 'list-archive' => 'list_archive', 'date' => 'date', 'from' => 'from', 'to' => 'to', 'subject' => 'subject', 'content-type' => 'content_type', 'x-priority' => 'x_priority');
+ $junk = array('X-AUTO-BCC', 'MESSAGE-ID', 'REFERENCES', 'X-SNOOZED', 'X-SCHEDULE', 'X-PROFILE-ID', 'X-DELIVERY', 'LIST-ARCHIVE', 'SUBJECT', 'FROM', 'CONTENT-TYPE', 'TO', '(', ')', ']', 'X-PRIORITY', 'DATE');
+ $flds = array('x-auto-bcc' => 'x_auto_bcc', 'message-id' => 'message_id', 'references' => 'references', 'x-snoozed' => 'x_snoozed', 'x-schedule' => 'x_schedule', 'x-profile-id' => 'x_profile_id', 'x-delivery' => 'x_delivery', 'list-archive' => 'list_archive', 'date' => 'date', 'from' => 'from', 'to' => 'to', 'subject' => 'subject', 'content-type' => 'content_type', 'x-priority' => 'x_priority');
$headers = array();
foreach ($res as $n => $vals) {
if (isset($vals[0]) && $vals[0] == '*') {
@@ -809,6 +809,9 @@ public function get_message_list($uids, $raw=false) {
$google_labels = '';
$x_auto_bcc = '';
$x_snoozed = '';
+ $x_schedule = '';
+ $x_profile_id = '';
+ $x_delivery = '';
$count = count($vals);
for ($i=0;$i<$count;$i++) {
if ($vals[$i] == 'BODY[HEADER.FIELDS') {
@@ -858,7 +861,7 @@ public function get_message_list($uids, $raw=false) {
'timestamp' => time(), 'charset' => $cset, 'x-priority' => $x_priority, 'google_msg_id' => $google_msg_id,
'google_thread_id' => $google_thread_id, 'google_labels' => $google_labels, 'list_archive' => $list_archive,
'references' => $references, 'message_id' => $message_id, 'x_auto_bcc' => $x_auto_bcc,
- 'x_snoozed' => $x_snoozed);
+ 'x_snoozed' => $x_snoozed, 'x_schedule' => $x_schedule, 'x_profile_id' => $x_profile_id, 'x_delivery' => $x_delivery);
if ($raw) {
$headers[$uid] = array_map('trim', $headers[$uid]);
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index c1190f2481..064fdf2732 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -202,9 +202,9 @@ protected function output() {
$txt .= $this->html_safe($value).'';
}
elseif ($fld == 'x-snoozed') {
- $snooze_header = parse_snooze_header($value);
+ $snooze_header = parse_nexter_header($value, 'X-Snoozed');
$txt .= '';
+ $txt .= $this->trans('Snoozed').''.$this->trans('Until').' '.$this->html_safe($snooze_header['until']).' Unsnooze ';
}
elseif ($fld == 'date') {
try {
@@ -387,6 +387,9 @@ protected function output() {
if($this->get('tags')){
$txt .= ' | '. tags_dropdown($this, $headers);
}
+ if (isset($headers['X-Schedule'])) {
+ $txt .= ' | ' . schedule_dropdown($this, true);
+ }
$is_draft = isset($headers['Flags']) && mb_stristr($headers['Flags'], 'draft');
if ($this->get('sieve_filters_enabled') && !$is_draft) {
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 90d245c37d..7683b0907e 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -126,7 +126,7 @@
.header_links {
padding-top: 10px !important;
}
-.header_links #dropdownMenuSnooze {
+.header_links #dropdownMenuNexterDate {
padding: 0;
border: unset;
font-variant: inherit;
@@ -134,7 +134,7 @@
font-size: inherit;
vertical-align: baseline;
}
-.header_links #dropdownMenuSnooze:hover {
+.header_links #dropdownMenuNexterDate:hover {
background-color: inherit;
color: inherit;
}
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 5017f139dc..974688dde1 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1248,6 +1248,52 @@ $(function() {
if (hm_page_name() === 'message_list' || hm_page_name() === 'message') {
imap_setup_snooze();
imap_setup_tags();
+ setup_nexter_date(function(e) {
+ $('.nexter_dropdown').hide();
+ var ids = [];
+ if (hm_page_name() == 'message') {
+ var list_path = hm_list_path().split('_');
+ ids.push(list_path[1]+'_'+hm_msg_uid()+'_'+list_path[2]);
+ } else {
+ $('input[type=checkbox]').each(function() {
+ if (this.checked && this.id.search('imap') != -1) {
+ var parts = this.id.split('_');
+ ids.push(parts[1]+'_'+parts[2]+'_'+parts[3]);
+ }
+ });
+ if (ids.length == 0) {
+ return;
+ };
+ }
+ var reload_and_redirect = function() {
+ Hm_Folders.reload_folders(true);
+ var path = hm_list_parent()? hm_list_parent(): hm_list_path();
+ window.location.replace('?page=message_list&list_path='+path);
+ }
+ if ($(this).parent().parent().is('.snooze_dropdown')) {
+ Hm_Ajax.request(
+ [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_snooze'},
+ {'name': 'imap_snooze_ids', 'value': ids},
+ {'name': 'imap_snooze_until', 'value': $(this).val()}],
+ function(res) {
+ if (res.snoozed_messages > 0) {
+ reload_and_redirect();
+ }
+ }
+ );
+ } else {
+ Hm_Ajax.request(
+ [{'name': 'hm_ajax_hook', 'value': 'ajax_re_schedule_message_sending'},
+ {'name': 'scheduled_msg_ids', 'value': ids},
+ {'name': 'schedule_date', 'value': $(this).val()}],
+ function(res) {
+ if (res.scheduled_msg_count > 0) {
+ reload_and_redirect();
+ }
+ }
+ );
+ }
+ });
}
if (hm_is_logged()) {
diff --git a/modules/profiles/functions.php b/modules/profiles/functions.php
index bb7abe0148..228cc936d0 100644
--- a/modules/profiles/functions.php
+++ b/modules/profiles/functions.php
@@ -12,7 +12,7 @@ function add_profile($name, $signature, $reply_to, $is_default, $email, $server_
'replyto' => $reply_to,
'default' => $is_default,
'address' => $email,
- 'server' => $server_mail,
+ 'server' => $imap_server_id,
'user' => $email,
'type' => 'imap'
);
diff --git a/modules/profiles/hm-profiles.php b/modules/profiles/hm-profiles.php
index 16997e0582..966827baa1 100644
--- a/modules/profiles/hm-profiles.php
+++ b/modules/profiles/hm-profiles.php
@@ -109,4 +109,14 @@ public static function loadLegacy($hmod) {
}
}
}
+
+ public static function search($fld, $value) {
+ $res = array();
+ foreach (self::getAll() as $profile) {
+ if (!empty($profile[$fld]) && $profile[$fld] == $value) {
+ $res[] = $profile;
+ }
+ }
+ return $res;
+ }
}
diff --git a/modules/smtp/hm-mime-message.php b/modules/smtp/hm-mime-message.php
index cb5d307f73..2c00df2669 100644
--- a/modules/smtp/hm-mime-message.php
+++ b/modules/smtp/hm-mime-message.php
@@ -21,10 +21,15 @@ class Hm_MIME_Msg {
private $final_msg = '';
/* build mime message data */
- function __construct($to, $subject, $body, $from, $html=false, $cc='', $bcc='', $in_reply_to_id='', $from_name='', $reply_to='') {
+ function __construct($to, $subject, $body, $from, $html=false, $cc='', $bcc='', $in_reply_to_id='', $from_name='', $reply_to='', $delivery_receipt='', $schedule='', $profile_id = '') {
if ($cc) {
$this->headers['Cc'] = $cc;
}
+ if ($schedule) {
+ $this->headers['X-Schedule'] = $schedule;
+ $this->headers['X-Profile-ID'] = $profile_id;
+ }
+
if ($in_reply_to_id) {
$this->headers['In-Reply-To'] = $in_reply_to_id;
}
@@ -41,6 +46,9 @@ function __construct($to, $subject, $body, $from, $html=false, $cc='', $bcc='',
else {
$this->headers['Reply-To'] = $from;
}
+ if ($delivery_receipt) {
+ $this->headers['X-Delivery'] = $delivery_receipt;
+ }
$this->headers['To'] = $to;
$this->headers['Subject'] = html_entity_decode($subject, ENT_QUOTES);
$this->headers['Date'] = date('r');
@@ -190,7 +198,7 @@ function prep_fld($val, $name) {
return $this->encode_fld($val);
}
- function find_addresses($str) {
+ static function find_addresses($str) {
$res = array();
foreach (process_address_fld($str) as $vals) {
$res[] = $vals['email'];
@@ -210,7 +218,7 @@ function get_recipient_addresses() {
else {
continue;
}
- $res = array_merge($res, $this->find_addresses($v));
+ $res = array_merge($res, self::find_addresses($v));
}
return $res;
}
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index e82b7587db..a78f2fa355 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -114,6 +114,8 @@ public function process() {
}
}
+
+
/**
* @subpackage smtp/handler
*/
@@ -210,6 +212,7 @@ public function process() {
}
}
+
/**
* @subpackage smtp/handler
*/
@@ -319,6 +322,8 @@ public function process() {
$draft_id = array_key_exists('draft_id', $this->request->post) ? $this->request->post['draft_id'] : false;
$draft_notice = array_key_exists('draft_notice', $this->request->post) ? $this->request->post['draft_notice'] : false;
$uploaded_files = array_key_exists('uploaded_files', $this->request->post) ? $this->request->post['uploaded_files'] : false;
+ $delivery_receipt = array_key_exists('compose_delivery_receipt', $this->request->post) ? $this->request->post['compose_delivery_receipt'] : false;
+ $schedule = array_key_exists('schedule', $this->request->post) ? $this->request->post['schedule'] : '';
if (array_key_exists('delete_uploaded_files', $this->request->post) && $this->request->post['delete_uploaded_files']) {
delete_uploaded_files($this->session, $draft_id);
@@ -333,16 +338,18 @@ public function process() {
}
$new_draft_id = save_imap_draft(array('draft_smtp' => $smtp, 'draft_to' => $to, 'draft_body' => $body,
'draft_subject' => $subject, 'draft_cc' => $cc, 'draft_bcc' => $bcc,
- 'draft_in_reply_to' => $inreplyto), $draft_id, $this->session,
+ 'draft_in_reply_to' => $inreplyto, 'delivery_receipt' => $delivery_receipt, 'schedule' => $schedule), $draft_id, $this->session,
$this, $this->cache, $uploaded_files);
if ($new_draft_id >= 0) {
if ($draft_notice) {
- Hm_Msgs::add('Draft saved');
+ $msg = $schedule ? 'Message scheduled to be sent later' : 'Draft saved';
+ Hm_Msgs::add($msg);
}
$this->out('draft_id', $new_draft_id);
}
elseif ($draft_notice) {
- Hm_Msgs::add('ERRUnable to save draft');
+ $msg = $schedule ? 'Something went wrong when scheduling draft' : 'Unable to save draft';
+ Hm_Msgs::add('ERR' . $msg);
}
return;
}
@@ -707,6 +714,7 @@ public function process() {
'draft_subject' => $form['compose_subject'],
'draft_smtp' => $smtp_id
);
+ $delivery_receipt = !empty($this->request->post['compose_delivery_receipt']);
$from_params = '';
$recipients_params = '';
@@ -726,7 +734,7 @@ public function process() {
/* msg details */
list($body, $cc, $bcc, $in_reply_to, $draft) = get_outbound_msg_detail($this->request->post, $draft, $body_type);
- if (!empty($this->request->post['compose_delivery_receipt'])) {
+ if ($delivery_receipt) {
$from_params = 'RET=HDRS';
$recipients_params = 'NOTIFY=SUCCESS,FAILURE';
}
@@ -758,7 +766,7 @@ public function process() {
}
/* build message */
- $mime = new Hm_MIME_Msg($to, $subject, $body, $from, $body_type, $cc, $bcc, $in_reply_to, $from_name, $reply_to);
+ $mime = new Hm_MIME_Msg($to, $subject, $body, $from, $body_type, $cc, $bcc, $in_reply_to, $from_name, $reply_to, $delivery_receipt);
/* add attachments */
$mime->add_attachments($uploaded_files);
@@ -899,6 +907,132 @@ public function process() {
}
}
+/**
+ * Send scheduled messages
+ * @subpackage smtp/handler
+ */
+class Hm_Handler_send_scheduled_messages extends Hm_Handler_Module {
+ /**
+ * Send delayed messages
+ * This should use cron
+ */
+ public function process() {
+ if (!($this->module_is_supported('imap') || $this->module_is_supported('profiles'))) {
+ return;
+ }
+ $servers = Hm_IMAP_List::dump();
+ $scheduled_msg_count = 0;
+ foreach (array_keys($servers) as $server_id) {
+ $cache = Hm_IMAP_List::get_cache($this->cache, $server_id);
+ $imap = Hm_IMAP_List::connect($server_id, $cache);
+ if (imap_authed($imap)) {
+ $folder = 'Scheduled';
+ $ret = $imap->get_mailbox_page($folder, 'DATE', false, 'ALL');
+ foreach ($ret[1] as $msg) {
+ $msg_headers = $imap->get_message_headers($msg['uid']);
+ try {
+ if (!empty($msg_headers['X-Schedule'])) {
+ $scheduled_msg_count++;
+ } else {
+ continue;
+ }
+ if (new DateTime($msg_headers['X-Schedule']) <= new DateTime()) {
+ $profile = Hm_Profiles::get($msg_headers['X-Profile-ID']);
+ if (!$profile) {
+ $profiles = Hm_Profiles::search('server', $imap_details['server']);
+
+ if (!$profiles) {
+ Hm_Debug::add(sprintf('ERRCannot find profiles corresponding with IMAP server: %s', $imap_details['server']));
+ continue;
+ }
+ $profile = $profiles[0];
+ }
+
+ $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
+
+ if (smtp_authed($smtp)) {
+ if (isset($msg_headers['X-Delivery'])) {
+ $from_params = 'RET=HDRS';
+ $recipients_params = 'NOTIFY=SUCCESS,FAILURE';
+ } else {
+ $from_params = '';
+ $recipients_params = '';
+ }
+ $recipients = [];
+ foreach (['To', 'Cc', 'Bcc'] as $fld) {
+ if (array_key_exists($fld, $msg_headers)) {
+ $recipients = array_merge($recipients, Hm_MIME_Msg::find_addresses($msg_headers[$fld]));
+ }
+ }
+ $msg_content = $imap->get_message_content($msg['uid'], 0);
+ $from = process_address_fld($msg_headers['From']);
+
+ $err_msg = $smtp->send_message($from[0]['email'], $recipients, $msg_content, $from_params, $recipients_params);
+
+ if (!$err_msg) {
+ if ($imap->message_action('DELETE', [$msg['uid']])) {
+ $imap->message_action('EXPUNGE', [$msg['uid']]);
+ }
+ save_sent_msg($this, $server_id, $imap, $imap_details, $msg_content, $msg['uid'], false);
+ $scheduled_msg_count--;
+ }
+ }
+ }
+ } catch (Exception $e) {
+ Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
+ if (send_scheduled_message($this, $imap, $msg, $server_id)) {
+ $scheduled_msg_count++;
+ }
+ }
+ }
+ }
+ }
+ $this->out('scheduled_msg_count', $scheduled_msg_count);
+ }
+}
+
+/**
+ * Changes the schedule of the message
+ * @subpackage smtp/handler
+ */
+class Hm_Handler_re_schedule_message_sending extends Hm_Handler_Module {
+ public function process() {
+ if (!($this->module_is_supported('imap') || $this->module_is_supported('profiles'))) {
+ return;
+ }
+ list($success, $form) = $this->process_form(array('schedule_date', 'scheduled_msg_ids'));
+ if (!$success) {
+ return;
+ }
+ $scheduled_msg_count = 0;
+ if ($form['schedule_date'] != 'now') {
+ $new_schedule_date = get_nexter_date($form['schedule_date']);
+ }
+ $ids = explode(',', $form['scheduled_msg_ids']);
+ foreach ($ids as $msg_part) {
+ list($imap_server_id, $msg_id, $folder) = explode('_', $msg_part);
+ $cache = Hm_IMAP_List::get_cache($this->cache, $imap_server_id);
+ $imap = Hm_IMAP_List::connect($imap_server_id, $cache);
+ if (imap_authed($imap)) {
+ $folder = hex2bin($folder);
+ if (reschedule_message_sending($this, $imap, $msg_id, $folder, $new_schedule_date, $imap_server_id)) {
+ $scheduled_msg_count++;
+ }
+ }
+ }
+ $this->out('scheduled_msg_count', $scheduled_msg_count);
+ if ($scheduled_msg_count == count($ids)) {
+ $msg = 'Operation successful';
+ } elseif ($scheduled_msg_count > 0) {
+ $msg = 'Some messages have been scheduled for sending';
+ } else {
+ $msg = 'ERRFailed to schedule sending for messages';
+ }
+ Hm_Msgs::add($msg);
+ $this->save_hm_msgs();
+ }
+}
+
/**
* @subpackage keyboard_shortcuts/output
*/
@@ -1254,11 +1388,15 @@ protected function output() {
}
}
}
-
$res .= ''.
smtp_server_dropdown($this->module_output(), $this, $recip, $selected_id).
- ''.$this->trans('Send').'
+ '.$this->trans('Send').'
+ Toggle Dropdown
+ '.
+ schedule_dropdown($this).
+ '
';
if ($this->get('list_path') && ($reply_type == 'reply' || $reply_type == 'reply_all')) {
$res .= '