Merge branch 'master' into mta-sts-implementation

Author: Danelif

modules/calendar/js_modules/route_handlers.js

@@ -1,7 +1,7 @@
 function applyCalendarPageHandlers() {
-    $('.event_delete').on("click", function() {
+    $('.event_delete a').on("click", function() {
         if (hm_delete_prompt()) {
-            $(this).parent().submit();
+            $(this).closest('form').submit();
         }
     });
     $('.cal_title').on("click", function(e) {

modules/calendar/site.css

@@ -4,3 +4,7 @@
 .calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
 .event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
 .event_details td { padding: 5px; border: none;  height: auto; }
+.event_detail {
+    max-height: 35vh;
+    overflow: auto;
+}

modules/core/js_modules/Hm_MessagesStore.js

@@ -312,7 +312,7 @@ class Hm_MessagesStore {
         } else {
             if (this.path == 'tag') {
                 config.push({ name: "hm_ajax_hook", value: 'ajax_imap_tag_data' });
-                config.push({ name: "folder", value: getParam('tag_id') });
+                config.push({ name: "folder", value: getParam('filter') });
                 configs.push(config);
             } else {
                 let sources = hm_data_sources();

modules/core/navigation/routes.js

@@ -81,6 +81,10 @@ const modulesRoutes = [
     {
         page: 'shortcuts',
         handler: 'applyShortcutsPageHandlers'
+    },
+    {
+        page: 'tags',
+        handler: 'applyTagsPageHandlers'
     }
 ]
 

modules/core/site.js

@@ -246,7 +246,7 @@ var Hm_Ajax_Request = function() { return {
                 res = Hm_Utils.json_decode(Hm_Crypt.decrypt(res.payload));
             }
             if ((res.status && res.status == 'not callable') || !res.router_login_state) {
-                this.fail(xhr, true, !res.router_login_state);
+                this.fail(xhr, true);
                 return;
             }
             if (Hm_Ajax.err_condition) {
@@ -2587,3 +2587,21 @@ function setupActionSnooze(callback) {
     });
     $(document).on('change', '.nexter_input_snooze', callback);
 }
+
+document.addEventListener("show.bs.dropdown", function (event) {
+    const currentToggle = event.target;
+
+    // If it's nested inside a dropdown menu, skip
+    if (currentToggle.closest(".dropdown-menu")) {
+        return;
+    }
+
+    // Close other top-level dropdowns
+    document.querySelectorAll(".dropdown-toggle.show").forEach((openBtn) => {
+        if (openBtn !== currentToggle && !openBtn.closest(".dropdown-menu")) {
+            const dropdownInstance = bootstrap.Dropdown.getInstance(openBtn);
+            if (dropdownInstance) dropdownInstance.hide();
+        }
+    });
+});
+

modules/imap/functions.php

@@ -1512,16 +1512,18 @@ function snooze_dropdown($output, $unsnooze = false) {
 }}
 
 if (!hm_exists('tags_dropdown')) {
-function tags_dropdown($context, $headers) {
+function tags_dropdown($context) {
+    $msgUid = $context->get('msg_text_uid');
+    $msgTags = Hm_Tags::getTagIdsWithMessage($msgUid);
+
     $folders = $context->get('tags', array());
     $txt = '<div class="dropdown d-inline-block">
-                <a class="hlink text-decoration-none btn btn-sm btn-outline-secondary dropdown-toggle" id="dropdownMenuTag" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$context->trans('Tags').'</a>
+                <a class="hlink text-decoration-none btn btn-sm btn-outline-secondary dropdown-toggle" id="dropdownMenuTag" data-bs-toggle="dropdown" aria-haspopup="true" href="#" aria-expanded="true">'.$context->trans('Tags').'</a>
                 <ul class="dropdown-menu" aria-labelledby="dropdownMenuTag">';
 
-    $tags =  !empty($headers['X-Cypht-Tags']) ? explode(',', $headers['X-Cypht-Tags']) : array();
     foreach ($folders as $folder) {
         $tag = $folder['name'];
-        $is_checked = in_array($folder['id'], array_map('trim', $tags));
+        $is_checked = in_array($folder['id'], $msgTags);
         $txt .= '<li class="d-flex dropdown-item gap-2">';
         $txt .= '<input class="form-check-input me-1 label-checkbox" type="checkbox" value="" aria-label="..." data-id="'.$folder['id'].'" '.($is_checked ? 'checked' : '').'>';
         $txt .= '<span>'.$context->trans($tag).'</span>';

modules/imap/hm-ews.php

@@ -565,12 +565,21 @@ public function get_message_list($itemIds, $include_preview = false) {
         $result = $this->ews->GetItem($request);
         $messages = [];
 
-        foreach ($result as $message) {
-            $flags = $this->extract_flags($message);
-            $uid = bin2hex($message->getItemId()->getId());
-            $msg = $this->getMessageProperties($message, $uid, $flags, $include_preview);
-            $messages[$uid] = $msg;
+        // For a mailbox with a single item, EWS returns the item directly instead of an array
+        if (! is_array($result)) {
+            $uid = bin2hex($result->getItemId()->getId());
+            $flags = $this->extract_flags($result);
+            $messages[$uid] = $this->getMessageProperties($result, $uid, $flags, $include_preview);
+            return $messages;
+        } else {
+            foreach ($result as $message) {
+                $flags = $this->extract_flags($message);
+                $uid = bin2hex($message->getItemId()->getId());
+                $msg = $this->getMessageProperties($message, $uid, $flags, $include_preview);
+                $messages[$uid] = $msg;
+            }
         }
+
         return $messages;
     }
 

modules/imap/output_modules.php

@@ -193,17 +193,17 @@ protected function output() {
             if (!array_key_exists('subject', lc_headers($headers)) || !trim(lc_headers($headers)['subject'])) {
                 $headers['subject'] = $this->trans('[No Subject]');
             }
-            
+
             // Start Bootstrap container
             $txt .= '<div class="container-fluid p-0 ml-0 border-bottom border-secondary-subtle text-muted">';
-            
+
             foreach ($small_headers as $fld) {
                 foreach ($headers as $name => $value) {
                     if ($fld == mb_strtolower($name)) {
                         if ($fld == 'subject') {
                             $txt .= '<div class="row g-0 py-0 py-sm-1 small_header d-flex">';
                             $txt .= '<div class="col-12">';
-                            if (isset($headers['Flags']) && mb_stristr($headers['Flags'], 'flagged')) {
+                            if (array_key_exists('flags', lc_headers($headers)) && mb_stristr(lc_headers($headers)['flags'], 'flagged')) {
                                 $txt .= '<i class="bi bi-star-half account_icon"></i> ';
                             }
                             $txt .= '<span class="fs-5 fw-normal text-dark js-header_subject">' . $this->html_safe($value) . '</span>';
@@ -271,10 +271,10 @@ protected function output() {
                             $txt .= '</div></div></div></div></div>';
                         }
                         elseif ($fld == 'reply-to') {
-                            $from = addr_parse($headers['From']);
+                            $from = addr_parse(lc_headers($headers)['from'] ?? '');
                             $replyEmails = array_map(function ($addr) {
                                 return $addr['email'];
-                            }, process_address_fld($headers['Reply-To']));
+                            }, process_address_fld(lc_headers($headers)['reply-to'] ?? ''));
 
                             if (count($replyEmails) === 1 && ($replyEmails[0] === $from['email'])) {
                                 $txt .= '<div class="row g-0 py-1 long_header">';
@@ -307,7 +307,7 @@ protected function output() {
                     }
                 }
             }
-            $is_draft = isset($headers['Flags']) && mb_stristr($headers['Flags'], 'draft');
+            $is_draft = array_key_exists('flags', lc_headers($headers)) && mb_stristr(lc_headers($headers)['flags'], 'draft');
             if($is_draft) {
                 $txt .= '<div class="row g-0 py-2"><div class="col-12 text-center text-md-start"><a class="btn btn-primary" href="?page=compose'.$reply_args.'&imap_draft=1"><i class="bi bi-pencil"></i> '.$this->trans('Edit Draft').'</a></div></div>';
             }
@@ -328,11 +328,11 @@ protected function output() {
                     }
                 }
             }
-            
+
             if ($this->get('list_headers')) {
                 $txt .= format_list_headers($this);
             }
-            
+
             $lc_headers = lc_headers($headers);
             if (array_key_exists('to', $lc_headers)) {
                 $addr_list = process_address_fld($lc_headers['to']);
@@ -362,9 +362,9 @@ protected function output() {
             $txt .= '<a href="#" class="hlink all_headers text-decoration-none btn btn-sm btn-outline-secondary">'.$this->trans('All headers').'</a>';
             $txt .= '<a class="hlink small_headers text-decoration-none btn btn-sm btn-outline-secondary" href="#">'.$this->trans('Small headers').'</a>';
             $txt .= '</div>';
-            
+
             $txt .= '<div class="d-flex flex-wrap gap-2">';
-            if (!isset($headers['Flags']) || !mb_stristr($headers['Flags'], 'draft')) {
+            if (!array_key_exists('flags', $lc_headers) || !mb_stristr($lc_headers['flags'], 'draft')) {
                 $txt .= '<a class="reply_link hlink text-decoration-none btn btn-sm btn-outline-secondary" href="?page=compose&amp;reply=1'.$reply_args.'">'.$this->trans('Reply').'</a>';
                 if ($size > 1) {
                     $txt .= '<a class="reply_all_link hlink text-decoration-none btn btn-sm btn-outline-secondary" href="?page=compose&amp;reply_all=1'.$reply_args.'">'.$this->trans('Reply-all').'</a>';
@@ -373,7 +373,7 @@ protected function output() {
                 }
                 $txt .= forward_dropdown($this, $reply_args);
             }
-            if (isset($headers['Flags']) && mb_stristr($headers['Flags'], 'flagged')) {
+            if (array_key_exists('flags', $lc_headers) && mb_stristr($lc_headers['flags'], 'flagged')) {
                 $txt .= '<a id="flag_msg" class="flagged_link hlink text-decoration-none btn btn-sm btn-outline-secondary hide" data-state="unflagged" href="#">'.$this->trans('Flag').'</a>';
                 $txt .= '<a id="unflag_msg" class="unflagged_link hlink text-decoration-none btn btn-sm btn-outline-secondary" data-state="flagged" href="#">'.$this->trans('Unflag').'</a>';
             } else {
@@ -388,17 +388,17 @@ protected function output() {
             if (!$this->get('is_archive_folder')) {
                 $txt .= '<a class="archive_link hlink text-decoration-none btn btn-sm btn-outline-secondary" id="archive_message" href="#">'.$this->trans('Archive').'</a>';
             }
-            
+
             if($this->get('tags')){
-                $txt .= tags_dropdown($this, $headers);
+                $txt .= tags_dropdown($this);
             }
-            if (isset($headers['X-Schedule'])) {
+            if (isset($lc_headers['x-schedule'])) {
                 $txt .= schedule_dropdown($this, true);
             }
 
             $settings = $this->get('user_settings', array());
             if(array_key_exists('enable_snooze_setting', $settings) && $settings['enable_snooze_setting']) {
-                $txt .= snooze_dropdown($this, isset($headers['X-Snoozed']));
+                $txt .= snooze_dropdown($this, isset($lc_headers['x-snoozed']));
             }
             if ($this->get('sieve_filters_enabled') && !$is_draft) {
                 $server_id = $this->get('msg_server_id');
@@ -407,7 +407,7 @@ protected function output() {
                     $user_config = $this->get('user_config');
                     $contact_list = $user_config->get('contacts', []);
                     $existing_emails = array_column($contact_list, 'email_address');
-                    $sender = addr_parse($headers['From'])['email'];
+                    $sender = addr_parse($lc_headers['from'] ?? '')['email'];
                     $domain = '*@'.get_domain($sender);
                     $blocked_senders = get_blocked_senders_array($imap_server, $this->get('site_config'), $this->get('user_config'));
                     $sender_blocked = in_array($sender, $blocked_senders);
@@ -742,7 +742,7 @@ protected function output() {
                 }
                 $res .= '</tr>';
             }
-        }   
+        }
         return $res;
     }
 }
@@ -1299,7 +1299,7 @@ protected function output() {
         if (!$enable_snooze) {
             return;
         }
-        
+
         $parts = explode('_', $this->get('list_path'));
         $unsnooze = $parts[0] == 'imap' && hex2bin($parts[2]) == 'Snoozed';
         $res = snooze_dropdown($this, $unsnooze);

modules/imap/site.js

@@ -413,7 +413,7 @@ async function select_imap_folder(path, page = 1, reload, processInTheBackground
                 const tableRow = Hm_Utils.tbody().find(`tr[data-uid="${rowUid}"]`);
                 if (!tableRow.length) {
                     const index = messages.rows.map(r => $(r['0']).data('uid')).indexOf(rowUid);
-                    if (Hm_Utils.rows().length >= index) {
+                    if ((Hm_Utils.rows().length - 1) >= index) {
                         Hm_Utils.rows().eq(index).before(row);
                     } else {
                         Hm_Utils.tbody().append(row);
@@ -500,18 +500,8 @@ $(document).on('submit', '#imap_filter_form', async function(event) {
     event.preventDefault();
     const url = new URL(location.href);
     url.search = $(this).serialize();
-    history.pushState(history.state, "", url.toString());
-    location.next = url.search;
-    try {
-        const messages = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number(), `${getParam('keyword')}_${getParam('filter')}`, getParam('sort'));
-        await messages.load(!messages.hasLocalData(), false, false, () => {
-            display_imap_mailbox(messages.rows, messages.list, messages);
-            showPagination(messages.pages);
-        });
-    } catch (error) {
-        console.log(error);
-        // Show error message. TODO: No message utility yet, implement it later.
-    }
+    url.searchParams.set('list_page', '1');
+    navigate(url.toString());
 });
 
 var display_imap_mailbox = function(rows, id, store, checkEmptyState = true) {
@@ -670,15 +660,16 @@ var get_message_content = function(msg_part, uid, list_path, listParent, detail,
                 $('.prev, .next').hide();
             }
             globals.auto_advance_email_enabled = Boolean(res.auto_advance_email_enabled);
+
+            if (callback) {
+                callback(res)
+            }
         };
 
         if (!msg_part) {
             var msgContent = get_local_message_content(uid, list_path);
             if (msgContent) {
                 onSuccess(msgContent);
-                if (callback) {
-                    callback(msgContent)
-                }
             }
         }
 
@@ -712,8 +703,7 @@ var get_message_content = function(msg_part, uid, list_path, listParent, detail,
                     }
                 },
                 [],
-                false,
-                callback
+                false
             );
         }
     }
@@ -1153,7 +1143,20 @@ function imap_setup_tags() {
         Hm_Ajax.request(
             [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_tag'},
             {'name': 'tag_id', 'value': folder_id},
-            {'name': 'list_path', 'value': ids}]
+            {'name': 'list_path', 'value': ids},
+            {'name': 'untag', 'value': !$(this).is(':checked')},
+            {'name': 'tag', 'value': $(this).is(':checked')}],
+            function() {
+                if (getPageNameParam() == 'message_list') {
+                    // remove cached message content so that tag changes are reflected
+                    ids.forEach((id) => {
+                        const uid = id.split('_')[1];
+                        Hm_Utils.remove_from_local_storage(getMessageStorageKey(uid));
+                    });
+                } else if (getPageNameParam() == 'message') {
+                    set_message_content();
+                }
+            }
         );
     });
 }

modules/smtp/hm-smtp.php

@@ -89,6 +89,7 @@ class Hm_SMTP {
     private $scramAuthenticator;
     private $supports_tls;
     private $supports_auth;
+    private $supports_dsn;
     private $max_message_size;
 
     function __construct($conf) {
@@ -250,6 +251,9 @@ function capabilities($ehlo_response) {
                     $auth_mecs = array_slice($line[1], 1);
                     $this->supports_auth = array_map(function($v) { return mb_strtolower($v); }, $auth_mecs);
                     break;
+                case 'dsn': // supports delivery status notifications
+                    $this->supports_dsn = true;
+                    break;
                 case 'size': // advisary maximum message size
                     if(isset($line[1][1]) && is_numeric($line[1][1])) {
                         $this->max_message_size = $line[1][1];
@@ -634,6 +638,10 @@ function send_message($from, $recipients, $message, $from_params = '', $recipien
         return $result;
     }
 
+    function supports_dsn() {
+        return $this->supports_dsn;
+    }
+
     function puke() {
         return
             print_r($this->debug, true).