From 2f1eaca8a7fc2739c81ce877e70559af4e63594b Mon Sep 17 00:00:00 2001
From: Amani Nyumu <amaninyumu1@gmail.com>
Date: Fri, 25 Oct 2024 08:01:23 +0100
Subject: [PATCH] [ENH]add Cypht-delay-send-later-scheduled-sending

---
 modules/core/functions.php                    |  24 +-
 modules/core/site.js                          |  48 ++--
 modules/imap/functions.php                    |  12 +-
 modules/imap/handler_modules.php              |   2 +-
 modules/imap/js_modules/route_handlers.js     |  19 +-
 .../utils/handleNexterDateAction.js           |  55 ++++
 modules/imap/site.js                          |  66 -----
 modules/smtp/js_modules/route_handlers.js     |  77 ++---
 modules/smtp/modules.php                      | 204 ++++++-------
 modules/smtp/site.js                          | 271 +-----------------
 10 files changed, 266 insertions(+), 512 deletions(-)
 create mode 100644 modules/imap/js_modules/utils/handleNexterDateAction.js

diff --git a/modules/core/functions.php b/modules/core/functions.php
index e196c9917..49db78a57 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -619,8 +619,26 @@ function check_file_upload($request, $key) {
     return true;
 }}
 
-if (!hm_exists('get_nexter_date')) {
-function get_nexter_date($format, $only_label = false) {
+function privacy_setting_callback($val, $key, $mod) {
+    $setting = Hm_Output_privacy_settings::$settings[$key];
+    $key .= '_setting';
+    $user_setting = $mod->user_config->get($key);
+    $update = $mod->request->post['update'];
+
+    if ($update) {
+        $val = implode($setting['separator'], array_filter(array_merge(explode($setting['separator'], $user_setting), [$val])));
+        $mod->user_config->set($key, $val);
+
+        $user_data = $mod->session->get('user_data', array());
+        $user_data[$key] = $val;
+        $mod->session->set('user_data', $user_data);
+        $mod->session->record_unsaved('Privacy settings updated');
+    }
+    return $val;
+}
+
+if (!hm_exists('get_scheduled_date')) {
+function get_scheduled_date($format, $only_label = false) {
     if ($format == 'later_in_day') {
         $date_string = 'today 18:00';
         $label = 'Later in the day';
@@ -675,7 +693,7 @@ function schedule_dropdown($output, $send_now = false) {
     }
     $txt .= '<ul class="dropdown-menu nexter_dropdown schedule_dropdown" aria-labelledby="dropdownMenuNexterDate">';
     foreach ($values as $format) {
-        $labels = get_nexter_date($format, true);
+        $labels = get_scheduled_date($format, true);
         $txt .= '<li><a href="#" class="nexter_date_helper dropdown-item d-flex justify-content-between gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
     }
     $txt .= '<li><hr class="dropdown-divider"></li>';
diff --git a/modules/core/site.js b/modules/core/site.js
index 9e25b8ee0..daa1cd1da 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1789,18 +1789,6 @@ 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();
 
@@ -1847,13 +1835,7 @@ $(function() {
     if (hm_mailto()) {
         try { navigator.registerProtocolHandler("mailto", "?page=compose&compose_to=%s", "Cypht"); } catch(e) {}
     }
-
-    if (hm_page_name() == 'home') {
-        $('.pw_update').on("click", function() { update_password($(this).data('id')); });
-    }
-    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');
@@ -2411,7 +2393,7 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
     }
 };
 
-var setup_nexter_date = function(callback) {
+function setupNexterDate(callback) {
     $(document).on('click', '.nexter_date_picker', function(e) {
         document.querySelector('.nexter_input_date').showPicker();
     });
@@ -2436,3 +2418,29 @@ var setup_nexter_date = function(callback) {
     });
     $(document).on('change', '.nexter_input', callback);
 }
+
+function setupNexterDateSnooze(callback) {
+    $(document).on('click', '.nexter_date_picker_snooze', function (e) {
+        document.querySelector('.nexter_input_date_snooze').showPicker();
+    });
+    $(document).on('click', '.nexter_date_helper_snooze', function (e) {
+        e.preventDefault();
+        $('.nexter_input_snooze').val($(this).attr('data-value')).trigger('change');
+    });
+    $(document).on('input', '.nexter_input_date_snooze', 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_snooze').css('border', '1px solid red');
+        } else {
+            $('.nexter_date_picker_snooze').css({ 'border': 'unset', 'border-top': '1px solid #ddd' });
+        }
+    });
+    $(document).on('change', '.nexter_input_date_snooze', function (e) {
+        if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) {
+            $('.nexter_input_snooze').val($(this).val()).trigger('change');
+        }
+    });
+    $(document).on('change', '.nexter_input_snooze', callback);
+}
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index e35c119e9..fd1a56aca 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1470,15 +1470,15 @@ function snooze_dropdown($output, $unsnooze = false) {
                 <button type="button" class="btn btn-light btn-sm dropdown-toggle" id="dropdownMenuNexterDate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$output->trans('Snooze').'</button>
                 <ul class="dropdown-menu nexter_dropdown snooze_dropdown" aria-labelledby="dropdownMenuNexterDate">';
     foreach ($values as $format) {
-        $labels = get_nexter_date($format, true);
-        $txt .= '<li><a href="#" class="nexter_date_helper dropdown-item d-flex justify-content-between gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
+        $labels = get_scheduled_date($format, true);
+        $txt .= '<li><a href="#" class="nexter_date_helper_snooze dropdown-item d-flex justify-content-between gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
     }
     $txt .= '<li><hr class="dropdown-divider"></li>';
-    $txt .= '<li><label for="nexter_input_date" class="nexter_date_picker dropdown-item cursor-pointer">'.$output->trans('Pick a date').'</label>';
-    $txt .= '<input id="nexter_input_date" type="datetime-local" min="'.date('Y-m-d\Th:m').'" class="nexter_input_date" style="visibility: hidden; position: absolute; height: 0;">';
-    $txt .= '<input class="nexter_input" style="display:none;"></li>';
+    $txt .= '<li><label for="nexter_input_date_snooze" class="nexter_date_picker_snooze dropdown-item cursor-pointer">'.$output->trans('Pick a date').'</label>';
+    $txt .= '<input id="nexter_input_date_snooze" type="datetime-local" min="'.date('Y-m-d\Th:m').'" class="nexter_input_date_snooze" style="visibility: hidden; position: absolute; height: 0;">';
+    $txt .= '<input class="nexter_input_snooze" style="display:none;"></li>';
     if ($unsnooze) {
-        $txt .= '<a href="#" data-value="unsnooze" class="unsnooze nexter_date_helper dropdown-item"">'.$output->trans('Unsnooze').'</a>';
+        $txt .= '<a href="#" data-value="unsnooze" class="unsnooze nexter_date_helper_snooze dropdown-item"">'.$output->trans('Unsnooze').'</a>';
     }
     $txt .= '</ul></div>';
 
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 431f87953..f185274cc 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1154,7 +1154,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_nexter_date($form['imap_snooze_until']);
+            $until = get_scheduled_date($form['imap_snooze_until']);
             $snooze_tag = "X-Snoozed: at $at; until $until";
         }
         $ids = explode(',', $form['imap_snooze_ids']);
diff --git a/modules/imap/js_modules/route_handlers.js b/modules/imap/js_modules/route_handlers.js
index 6b9860391..18e808b03 100644
--- a/modules/imap/js_modules/route_handlers.js
+++ b/modules/imap/js_modules/route_handlers.js
@@ -4,10 +4,25 @@ function applyImapMessageListPageHandlers(routeParams) {
     imap_setup_snooze();
     imap_setup_tags();
 
+    Hm_Message_List.set_row_events();
+
+    handleNexterDateAction();
+
+    $('.core_msg_control').on("click", function (e) {
+        e.preventDefault();
+        Hm_Message_List.message_action($(this).data('action'));
+    });
+
+    $('.toggle_link').on("click", function (e) {
+        e.preventDefault();
+        Hm_Message_List.toggle_rows();
+    });
+
+    if (window.githubMessageListPageHandler) githubMessageListPageHandler(routeParams);
     if (window.inlineMessageMessageListAndSearchPageHandler) inlineMessageMessageListAndSearchPageHandler(routeParams);
     if (window.wpMessageListPageHandler) wpMessageListPageHandler(routeParams);
 
-    return async function() {
+    return async function () {
         const [refreshIntervalId, abortController] = await setupPageResult;
         abortController.abort();
         clearInterval(refreshIntervalId);
@@ -33,4 +48,4 @@ function applyImapMessageContentPageHandlers(routeParams) {
 
     if (window.pgpMessageContentPageHandler) pgpMessageContentPageHandler();
     if (window.wpMessageContentPageHandler) wpMessageContentPageHandler(routeParams);
-}
\ No newline at end of file
+}
diff --git a/modules/imap/js_modules/utils/handleNexterDateAction.js b/modules/imap/js_modules/utils/handleNexterDateAction.js
new file mode 100644
index 000000000..40311c4ea
--- /dev/null
+++ b/modules/imap/js_modules/utils/handleNexterDateAction.js
@@ -0,0 +1,55 @@
+function handleNexterDateAction(e) {
+    let reload_and_redirect = function () {
+        Hm_Folders.reload_folders(true);
+        let path = hm_list_parent() ? hm_list_parent() : hm_list_path();
+        window.location.replace('?page=message_list&list_path=' + path);
+    };
+
+    let collectCheckedIds = function () {
+        let ids = [];
+        $('input[type=checkbox]').each(function () {
+            if (this.checked && this.id.search('imap') !== -1) {
+                let parts = this.id.split('_');
+                ids.push(parts[1] + '_' + parts[2] + '_' + parts[3]);
+            }
+        });
+        if (ids.length === 0) {
+            return;
+        } 
+        return ids;
+    };
+    
+    setupNexterDate(function () {
+        let ids = collectCheckedIds();
+       
+            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();
+                    }
+                }
+            );
+    });
+
+    setupNexterDateSnooze(function () {
+        let ids = collectCheckedIds();
+
+        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();
+                }
+            }
+        );
+    });
+}
\ No newline at end of file
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 8e71a0ccb..5db5b59d7 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1200,72 +1200,6 @@ $(function() {
         setTimeout(search_selected_for_imap, 100);
     });
 
-    if (hm_page_name() === 'message_list' && hm_list_path().substr(0, 4) === 'imap') {
-        setup_imap_folder_page();
-    }
-    else if (hm_page_name() === 'message_list' && hm_list_path() === 'combined_inbox') {
-        setup_imap_message_list_content_page();
-    }
-    else if (hm_page_name() === 'message' && hm_list_path().substr(0, 4) === 'imap') {
-        imap_setup_message_view_page();
-    }
-    else if (hm_page_name() === 'servers') {
-        imap_setup_server_page();
-    }
-    else if (hm_page_name() === 'info') {
-        setTimeout(imap_status_update, 100);
-    }
-
-    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()) {
         imap_unsnooze_messages();
diff --git a/modules/smtp/js_modules/route_handlers.js b/modules/smtp/js_modules/route_handlers.js
index 784959957..d4597991f 100644
--- a/modules/smtp/js_modules/route_handlers.js
+++ b/modules/smtp/js_modules/route_handlers.js
@@ -2,18 +2,28 @@
 function applyComposePageHandlers() {
     init_resumable_upload()
 
+    let isScheduledMode = null;
+
+    setupNexterDate(function () {
+        let schedule = $('.nexter_input').val();
+        $('.smtp_send_placeholder').trigger('click');
+
+        save_compose_state(false, true, schedule);
+        isScheduledMode = schedule;
+    });
+
     if (window.HTMLEditor) {
         useKindEditor();
     }
 
     var interval = Hm_Utils.get_from_global('compose_save_interval', 30);
-    Hm_Timer.add_job(function() { save_compose_state(); }, interval, true);
-    $('.draft_title').on("click", function() { $('.draft_list').toggle(); });
-    $('.toggle_recipients').on("click", function() { return toggle_recip_flds(); });
+    Hm_Timer.add_job(function () {save_compose_state();}, interval, true);
+    $('.draft_title').on("click", function () { $('.draft_list').toggle(); });
+    $('.toggle_recipients').on("click", function () { return toggle_recip_flds(); });
     $('.smtp_reset').on("click", reset_smtp_form);
-    $('.delete_draft').on("click", function() { smtp_delete_draft($(this).data('id')); });
-    $('.smtp_save').on("click", function() { save_compose_state(false, true); });
-    $('.smtp_send_archive').on("click", function() { send_archive(false, true); });
+    $('.delete_draft').on("click", function () { smtp_delete_draft($(this).data('id')); });
+    $('.smtp_save').on("click", function () { save_compose_state(false, true); });
+    $('.smtp_send_archive').on("click", function () { send_archive(false, true); });
 
     const modal = new Hm_Modal({
         modalId: 'emptySubjectBodyModal',
@@ -85,7 +95,7 @@ function applyComposePageHandlers() {
         ========================================
         */
         function showModal() {
-            if (! modal.modalContent.html()) {
+            if (!modal.modalContent.html()) {
                 modal.addFooterBtn(hm_trans('Send anyway'), 'btn-warning', handleSendAnyway);
                 if (showBtnSendAnywayDontWarnFuture) {
                     modal.addFooterBtn(hm_trans("Send anyway and don't warn in the future"), 'btn-warning', handleSendAnywayAndDontWarnMe);
@@ -99,26 +109,26 @@ function applyComposePageHandlers() {
             return new Promise((resolve) => {
                 const checkValue = () => {
                     if ($(selector).val() !== targetValue) {
-                        resolve();  
+                        resolve();
                     } else {
-                        setTimeout(checkValue, 100); 
+                        setTimeout(checkValue, 100);
                     }
                 };
-                checkValue();  
+                checkValue();
             });
         }
 
         async function handleSendAnyway() {
 
             if ($('.compose_draft_id').val() == '0') {
-            Hm_Notices.show([hm_trans('Please wait, sending message...')]);
-            await waitForValueChange('.compose_draft_id', '0');
+                Hm_Notices.show([hm_trans('Please wait, sending message...')]);
+                await waitForValueChange('.compose_draft_id', '0');
             }
 
-            
-        
             if (handleMissingAttachment()) {
-                document.getElementsByClassName("smtp_send")[0].click();
+                if (isScheduledMode == null) {
+                    document.getElementsByClassName("smtp_send")[0].click();
+                }
             } else {
                 e.preventDefault();
             }
@@ -162,53 +172,53 @@ function applyComposePageHandlers() {
             return true;
         }
     });
-    $('.compose_form').on('submit', function() {
+    $('.compose_form').on('submit', function () {
         process_compose_form();
     });
     if ($('.compose_cc').val() || $('.compose_bcc').val()) {
         toggle_recip_flds();
     }
     if (window.location.href.search('&reply=1') !== -1 || window.location.href.search('&reply_all=1') !== -1) {
-        replace_cursor_positon ($('textarea[name="compose_body"]'));
+        replace_cursor_positon($('textarea[name="compose_body"]'));
     }
     if (window.location.href.search('&forward=1') !== -1) {
-        setTimeout(function() {
+        setTimeout(function () {
             save_compose_state();
         }, 100);
     }
     if ($('.sys_messages').text() != 'Message Sent') {
         get_smtp_profile($('.compose_server').val());
     }
-    $('.compose_server').on('change', function() {
+    $('.compose_server').on('change', function () {
         get_smtp_profile($('.compose_server').val());
     });
-    if($('.compose_attach_button').attr('disabled') == 'disabled'){
+    if ($('.compose_attach_button').attr('disabled') == 'disabled') {
         check_attachment_dir_access();
     };
 
     $('.compose_container').attr('ondrop', 'move_recipient_to_section(event)').attr('ondragover', 'allow_drop(event)');
-    $('.compose_to, .compose_cc, .compose_bcc').on('keypress', function(e) {
-        if(e.which == 13) {
+    $('.compose_to, .compose_cc, .compose_bcc').on('keypress', function (e) {
+        if (e.which == 13) {
             e.preventDefault();
             text_to_bubbles(this);
         }
     });
-    $('.compose_to, .compose_cc, .compose_bcc').on('blur', function(e) {
+    $('.compose_to, .compose_cc, .compose_bcc').on('blur', function (e) {
         e.preventDefault();
         text_to_bubbles(this);
     });
-    $('.compose_subject, .compose_body, .compose_server, .smtp_send_placeholder, .smtp_send_archive').on('focus', function(e) {
-        $('.compose_to, .compose_cc, .compose_bcc').each(function() {
+    $('.compose_subject, .compose_body, .compose_server, .smtp_send_placeholder, .smtp_send_archive').on('focus', function (e) {
+        $('.compose_to, .compose_cc, .compose_bcc').each(function () {
             bubbles_to_text(this);
         });
     });
-    $('.compose_to, .compose_cc, .compose_bcc').on('focus', function(e) {
+    $('.compose_to, .compose_cc, .compose_bcc').on('focus', function (e) {
         text_to_bubbles(this);
     });
-    $('.compose_container').on('click', function() {
+    $('.compose_container').on('click', function () {
         $(this).find('input').focus();
     });
-    $(document).on('click', '.bubble_close', function(e) {
+    $(document).on('click', '.bubble_close', function (e) {
         e.stopPropagation();
         $(".bubble_dropdown-content").remove();
         $(this).parent().remove();
@@ -222,7 +232,7 @@ function applyComposePageHandlers() {
     var excludedEmail = null;
 
     const excludeEmail = function () {
-        var newRecipients = recipientsInput.val().split(',').filter(function(email) {
+        var newRecipients = recipientsInput.val().split(',').filter(function (email) {
             if (email.includes(selectedEmail)) {
                 excludedEmail = email;
                 return false;
@@ -234,7 +244,7 @@ function applyComposePageHandlers() {
 
     if (recipientsInput.val().includes(selectedEmail)) {
         excludeEmail();
-        $(document).on('change', '#compose_smtp_id', function() {
+        $(document).on('change', '#compose_smtp_id', function () {
             if ($(this).val() !== selectedVal) {
                 if (!recipientsInput.val().includes(selectedEmail)) {
                     recipientsInput.val(recipientsInput.val() + ', ' + excludedEmail);
@@ -245,9 +255,10 @@ function applyComposePageHandlers() {
         });
     }
 
-    $('.compose_to').on('keyup', function(e) { autocomplete_contact(e, '.compose_to', '#to_contacts'); });
-    $('.compose_cc').on('keyup', function(e) { autocomplete_contact(e, '.compose_cc', '#cc_contacts'); });
-    $('.compose_bcc').on('keyup', function(e) { autocomplete_contact(e, '.compose_bcc', '#bcc_contacts'); });
+
+    $('.compose_to').on('keyup', function (e) { autocomplete_contact(e, '.compose_to', '#to_contacts'); });
+    $('.compose_cc').on('keyup', function (e) { autocomplete_contact(e, '.compose_cc', '#cc_contacts'); });
+    $('.compose_bcc').on('keyup', function (e) { autocomplete_contact(e, '.compose_bcc', '#bcc_contacts'); });
     $('.compose_to').focus();
 
     if (window.pgpComposePageHandler) pgpComposePageHandler();
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 4dbf2b58a..f41e8cbbc 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -900,80 +900,44 @@ 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++;
-                        }
+   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 (send_scheduled_message($this, $imap, $msg, $server_id)) {
+                        $scheduled_msg_count--;
                     }
+                } catch (Exception $e) {
+                    Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
                 }
             }
         }
-        $this->out('scheduled_msg_count', $scheduled_msg_count);
     }
-}
+
+    $this->out('scheduled_msg_count', $scheduled_msg_count);
+}}
 
 /**
  * Changes the schedule of the message
@@ -990,7 +954,7 @@ public function process() {
         }
         $scheduled_msg_count = 0;
         if ($form['schedule_date'] != 'now') {
-            $new_schedule_date = get_nexter_date($form['schedule_date']);
+            $new_schedule_date = get_scheduled_date($form['schedule_date']);
         }
         $ids = explode(',', $form['scheduled_msg_ids']);
         foreach ($ids as $msg_part) {
@@ -2072,13 +2036,13 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
     }
     $cache = Hm_IMAP_List::get_cache($mod_cache, $imap_profile['id']);
     $imap = Hm_IMAP_List::connect($imap_profile['id'], $cache);
-
+        
     if (!empty($atts['schedule'])) {
         $folder ='Scheduled';
         if (!count($imap->get_mailbox_status($folder))) {
             $imap->create_mailbox($folder);
         }
-        $atts['schedule'] = get_nexter_date($atts['schedule']);
+        $atts['schedule'] = get_scheduled_date($atts['schedule']);
     } else {
         $folder = $specials['draft'];
     }
@@ -2086,12 +2050,12 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
 
     $mime = prepare_draft_mime($atts, $uploaded_files, $from, $name, $profile['id']);
     $res = $mime->process_attachments();
-
+    
     $msg = str_replace("\r\n", "\n", $mime->get_mime_msg());
     $msg = str_replace("\n", "\r\n", $msg);
     $msg = rtrim($msg)."\r\n";
 
-    if ($imap->append_start($specials['draft'], mb_strlen($msg), false, true)) {
+    if ($imap->append_start($folder, mb_strlen($msg), false, true)) {
         $imap->append_feed($msg."\r\n");
         if (!$imap->append_end()) {
             Hm_Msgs::add('ERRAn error occurred saving the draft message');
@@ -2395,60 +2359,64 @@ function recip_count_check($headers, $omod) {
 if (!hm_exists('send_scheduled_message')) {
 function send_scheduled_message($handler, $imap, $msg, $server_id) {
     $msg_headers = $imap->get_message_headers($msg['uid']);
-    $imap_details = Hm_IMAP_List::dump($server_id);
-    if (empty($imap_details)) {
-        return;
-    }
-    try {
-        if (empty($msg_headers['X-Schedule'])) {
-            return;
+        $imap_details = Hm_IMAP_List::dump($server_id);
+        if (empty($imap_details)) {
+            return false;
         }
-        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']));
-                    return;
-                }
-                $profile = $profiles[0];
+        try {
+            if (empty($msg_headers['X-Schedule'])) {
+                return false;
             }
 
-            $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
+            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 (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]));
+                    if (!$profiles) {
+                        Hm_Debug::add(sprintf('ERRCannot find profiles corresponding with IMAP server: %s', $imap_details['server']));
+                        return false;
                     }
+                    $profile = $profiles[0];
                 }
-                $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);
+                $smtp = Hm_SMTP_List::connect($profile['smtp_id'], false);
 
-                if (!$err_msg) {
-                    if ($imap->message_action('DELETE', [$msg['uid']])) {
-                        $imap->message_action('EXPUNGE', [$msg['uid']]);
+                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($handler, $server_id, $imap, $imap_details, $msg_content, $msg['uid'], false);
+                        return true; 
                     }
-                    save_sent_msg($handler, $server_id, $imap, $imap_details, $msg_content, $msg['uid'], false);
-                    return true;
                 }
             }
+        } catch (Exception $e) {
+            Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
         }
-    } catch (Exception $e) {
-        Hm_Debug::add(sprintf('ERRCannot send message: %s', $msg_headers['subject']));
-    }
-    return;
+        return false; 
 }}
 
 if (!hm_exists('reschedule_message_sending')) {
@@ -2462,7 +2430,7 @@ function reschedule_message_sending($handler, $imap, $msg_id, $folder, $new_date
     }
     preg_match("/^X-Schedule:.*(\r?\n[ \t]+.*)*\r?\n?/im", $msg, $matches);
     if (count($matches)) {
-        $new_date = get_nexter_date($new_date);
+        $new_date = get_scheduled_date($new_date);
         $msg = str_replace($matches[0], "X-Schedule: {$new_date}\n", $msg);
     } else {
         return;
@@ -2485,5 +2453,5 @@ function reschedule_message_sending($handler, $imap, $msg_id, $folder, $new_date
             }
         }
     }
-    return $res;
-}}
+    return $res; 
+}}
\ No newline at end of file
diff --git a/modules/smtp/site.js b/modules/smtp/site.js
index def3ef7b0..f51fbb991 100644
--- a/modules/smtp/site.js
+++ b/modules/smtp/site.js
@@ -28,7 +28,7 @@ var smtp_test_action = function(event) {
         false,
         {'smtp_connect': 1}
     );
-};             
+};
 
 var smtp_delete_action = function(event) {
     if (!hm_delete_prompt()) {
@@ -116,6 +116,12 @@ var save_compose_state = function(no_files, notice, schedule, callback) {
             if (res.draft_subject) {
                 $('.draft_list .draft_'+draft_id+' a').text(res.draft_subject);
             }
+
+            if (schedule) {
+                $(".compose_form")[0].reset();
+                return;
+            }
+            
             if (callback) {
                 callback(res);
             }
@@ -389,265 +395,4 @@ function smtpSettingsPageHandler() {
             []
         );
     });
-}
-$(function () {
-    if (!hm_is_logged()) {
-        return;
-    }
-    if (hm_page_name() === 'settings') {
-        $('#clear_chunks_button').on('click', function(e) {
-            e.preventDefault();
-            Hm_Ajax.request(
-                [{'name': 'hm_ajax_hook', 'value': 'ajax_clear_attachment_chunks'}],
-                function(res) {
-
-                },
-                []
-            );
-        });
-    }
-    if (hm_page_name() === 'compose') {
-        init_resumable_upload()
-        setup_nexter_date(function() {
-            $('.smtp_send_placeholder').trigger('click');
-        });
-
-        var interval = Hm_Utils.get_from_global('compose_save_interval', 30);
-        Hm_Timer.add_job(function() { save_compose_state(); }, interval, true);
-        $('.draft_title').on("click", function() { $('.draft_list').toggle(); });
-        $('.toggle_recipients').on("click", function() { return toggle_recip_flds(); });
-        $('.smtp_reset').on("click", reset_smtp_form);
-        $('.delete_draft').on("click", function() { smtp_delete_draft($(this).data('id')); });
-        $('.smtp_save').on("click", function() { save_compose_state(false, true); });
-        $('.smtp_send_archive').on("click", function() { send_archive(false, true); });
-
-        const modal = new Hm_Modal({
-            modalId: 'emptySubjectBodyModal',
-            title: 'Warning',
-            btnSize: 'sm'
-        });
-
-        $('.smtp_send_placeholder').on("click", function (e) {
-            if (window.kindEditor) {
-                kindEditor.sync();
-            }
-
-            if (window.mdEditor) {
-                mdEditor.codemirror.save();
-            }
-
-            const body = $('.compose_body').val().trim();
-            const subject = $('.compose_subject').val().trim();
-
-            let modalContentHeadline = '';
-            let dontWanValueInStorage = '';
-            let showBtnSendAnywayDontWarnFuture = true;
-
-            // If the subject is empty, we should warn the user
-            if (!subject) {
-                dontWanValueInStorage = 'dont_warn_empty_subject';
-                modalContentHeadline = "Your subject is empty!";
-            }
-
-            // If the body is empty, we should warn the user
-            if (!body) {
-                dontWanValueInStorage = 'dont_warn_empty_body';
-                modalContentHeadline = "Your body is empty!";
-            }
-
-            // if both the subject and the body are empty, we should warn the user
-            if (!body && !subject) {
-                dontWanValueInStorage = 'dont_warn_empty_subject_body';
-                modalContentHeadline = "Your subject and body are empty!";
-            }
-
-            if (hm_module_is_supported('contacts')) {
-                var checkInList = check_cc_exist_in_contacts_list();
-                // if contact_cc not exist in contact list for user
-                if (checkInList) {
-                    modalContentHeadline = "Adress mail not exist in your contact list";
-                    showBtnSendAnywayDontWarnFuture = false;
-                }
-
-            }
-
-            // If the user has disabled the warning, we should send the message
-            if (Boolean(Hm_Utils.get_from_local_storage(dontWanValueInStorage))) {
-                handleSendAnyway();
-            }
-            // Otherwise, we should show the modal if we have a headline
-            else if (modalContentHeadline) {
-                modalContentHeadline = `<p>${hm_trans(modalContentHeadline)}</p>`;
-                return showModal(modalContentHeadline);
-            }
-            // Subject and body are not empty, we can send the message
-            else {
-                handleSendAnyway();
-            }
-
-            /*
-            ========================================
-            Functions declarations
-            ========================================
-            */
-            function showModal() {
-                if (! modal.modalContent.html()) {
-                    modal.addFooterBtn(hm_trans('Send anyway'), 'btn-warning', handleSendAnyway);
-                    if (showBtnSendAnywayDontWarnFuture) {
-                        modal.addFooterBtn(hm_trans("Send anyway and don't warn in the future"), 'btn-warning', handleSendAnywayAndDontWarnMe);
-                    }
-                }
-                modal.setContent(modalContentHeadline + checkInList + `<p>${hm_trans('Are you sure you want to send this message?')}</p>`);
-                modal.open();
-            }
-
-            function handleSendAnyway() {
-                if (handleMissingAttachment()) {
-                    if ($('.nexter_input').val()) {
-                        save_compose_state(false, true, $('.nexter_input').val(), function(res) {
-                            if (!res.router_user_msgs[0].startsWith('ERR')) {
-                                reset_smtp_form(false);
-                                Hm_Folders.reload_folders(true);
-                                Hm_Utils.redirect();
-                            }
-                        });
-                    } else {
-                        document.getElementsByClassName("smtp_send")[0].click();
-                    }
-                } else {
-                    e.preventDefault();
-                }
-            };
-
-            function handleSendAnywayAndDontWarnMe() {
-                Hm_Utils.save_to_local_storage(dontWanValueInStorage, true);
-                handleSendAnyway();
-            };
-
-            function handleMissingAttachment() {
-                var uploaded_files = $("input[name='uploaded_files[]']").map(function () { return $(this).val(); }).get();
-                const compose_body_value = document.getElementById('compose_body').value;
-                const force_send = document.getElementById('force_send')?.value;
-                var reminder_value = $('.compose_form').data('reminder');
-                if (reminder_value === 1 && force_send !== '1') {
-                    let all_translated_keywords = [];
-                    for (let lang in window.hm_translations) {
-                        if (window.hm_translations.hasOwnProperty(lang)) {
-                            // Get translated keywords for the current language
-                            const translated_keywords = hm_trans('attachment,file,attach,attached,attaching,enclosed,CV,cover letter', lang).split(',');
-                            // Concatenate translated keywords with the array
-                            all_translated_keywords = all_translated_keywords.concat(translated_keywords);
-                        }
-                    }
-                    const additional_keywords = ['.doc', '.pdf'];
-                    // Split the translated keywords into an array && Add additional keywords or file extensions
-                    const combined_keywords = all_translated_keywords.concat(additional_keywords);
-                    // Build the regex pattern
-                    const pattern = new RegExp('(' + combined_keywords.map(keyword => keyword.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')).join('|') + ')', 'i');
-                    // Check if the pattern is found in the message
-                    if (pattern.test(compose_body_value) && uploaded_files.length === 0) {
-
-                        if (confirm(hm_trans('We couldn\'t find the attachment you referred to. Please confirm if you attached it or provide the details again.'))) {
-                            force_send_message();
-                        } else {
-                            return false;
-                        }
-                    }
-                }
-                return true;
-            }
-        });
-        $('.compose_form').on('submit', function() {
-            process_compose_form();
-        });
-        if ($('.compose_cc').val() || $('.compose_bcc').val()) {
-            toggle_recip_flds();
-        }
-        if (window.location.href.search('&reply=1') !== -1 || window.location.href.search('&reply_all=1') !== -1) {
-            replace_cursor_positon ($('textarea[name="compose_body"]'));
-        }
-        if (window.location.href.search('&forward=1') !== -1) {
-            setTimeout(function() {
-                save_compose_state();
-            }, 100);
-        }
-        if ($('.sys_messages').text() != 'Message Sent') {
-            get_smtp_profile($('.compose_server').val());
-        }
-        $('.compose_server').on('change', function() {
-            get_smtp_profile($('.compose_server').val());
-        });
-        if($('.compose_attach_button').attr('disabled') == 'disabled'){
-            check_attachment_dir_access();
-        };
-
-        $('.compose_container').attr('ondrop', 'move_recipient_to_section(event)').attr('ondragover', 'allow_drop(event)');
-        $('.compose_to, .compose_cc, .compose_bcc').on('keypress', function(e) {
-            if(e.which == 13) {
-                e.preventDefault();
-                text_to_bubbles(this);
-            }
-        });
-        $('.compose_to, .compose_cc, .compose_bcc').on('blur', function(e) {
-            e.preventDefault();
-            text_to_bubbles(this);
-        });
-        $('.compose_subject, .compose_body, .compose_server, .smtp_send_placeholder, .smtp_send_archive').on('focus', function(e) {
-            $('.compose_to, .compose_cc, .compose_bcc').each(function() {
-                bubbles_to_text(this);
-            });
-        });
-        $('.compose_to, .compose_cc, .compose_bcc').on('focus', function(e) {
-            text_to_bubbles(this);
-        });
-        $('.compose_container').on('click', function() {
-            $(this).find('input').focus();
-        });
-        $(document).on('click', '.bubble_close', function(e) {
-            e.stopPropagation();
-            $(".bubble_dropdown-content").remove();
-            $(this).parent().remove();
-        });
-
-        var selectedOption = $('#compose_smtp_id option[selected]');
-        var selectedEmail = selectedOption.data('email');
-        var selectedVal = selectedOption.val();
-
-        var recipientsInput = $('#compose_cc');
-        var excludedEmail = null;
-
-        const excludeEmail = function () {
-            var newRecipients = recipientsInput.val().split(',').filter(function(email) {
-                if (email.includes(selectedEmail)) {
-                    excludedEmail = email;
-                    return false;
-                }
-                return true;
-            }).join(', ');
-            recipientsInput.val(newRecipients);
-        };
-
-        if (recipientsInput.val().includes(selectedEmail)) {
-            excludeEmail();
-            $(document).on('change', '#compose_smtp_id', function() {
-                if ($(this).val() !== selectedVal) {
-                    if (!recipientsInput.val().includes(selectedEmail)) {
-                        recipientsInput.val(recipientsInput.val() + ', ' + excludedEmail);
-                    }
-                } else {
-                    excludeEmail();
-                }
-            });
-        }
-
-    }
-    send_scheduled_messages();
-    setInterval(send_scheduled_messages, 60000);
-
-    window.onbeforeunload = (e) => {
-        if (scheduled_msg_count > 0 && e.currentTarget.location.hostname !== document.location.hostname) {
-            return sprintf(hm_trans("You have %d scheduled messages that won\'t be executed if you quit"), scheduled_msg_count);
-        }
-        return;
-    };
-});
+}
\ No newline at end of file