Merge branch 'master' into cypht-filter-start-from-one

Author: camilevahviraki

composer.lock

@@ -434,7 +434,9 @@
     | 'cache_class' => env('CACHE_CLASS')
     */
 
+    'allow_session_cache' => env('ALLOW_SESSION_CACHE', false),
 
+    'cache_class' => env('CACHE_CLASS'),
     /*
     | -------------
     | Redis Support

config/app.php

@@ -74,7 +74,10 @@
     |  Postgresql:
     |   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, hm_version INTEGER DEFAULT 1, date timestamp);
     |
-    |  MySQL or SQLite:
+    |  MySQL:
+    |   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, hm_version INTEGER DEFAULT 1, date timestamp, primary key (hm_id));
+    |
+    |  SQLite:
     |   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, hm_version INTEGER DEFAULT 1, lock INTEGER DEFAULT 0, date timestamp, primary key (hm_id));
     |
     |

config/database.php

@@ -370,7 +370,20 @@ class Hm_Output_filter_imap_advanced_search extends Hm_Output_Module {
      */
     protected function output() {
         if ($this->get('imap_search_results')) {
-            prepare_imap_message_list($this->get('imap_search_results'), $this, 'advanced_search');
+            $adv_search_result = format_imap_message_list(
+                $this->get('imap_search_results'), 
+                $this, 
+                'advanced_search',
+                'email'
+            );
+            
+            // Convert format (ID => [HTML, ID]) to format expected (HTML => ID)
+            $res = array();
+            foreach ($adv_search_result as $id => $row_data) {
+                $res[$row_data[0]] = $id;
+            }
+            
+            $this->out('formatted_message_list', $res);
         }
         elseif (!$this->get('formatted_message_list')) {
             $this->out('formatted_message_list', array());

modules/advanced_search/modules.php

@@ -76,13 +76,14 @@ var expand_adv_folder = function(res) {
         var list_container = $('.adv_folder_list');
         var folders = $(res.imap_expanded_folder_formatted);
         folders.find('.manage_folders_li').remove();
-        $('.'+Hm_Utils.clean_selector(res.imap_expanded_folder_path), $('.adv_folder_list')).append(folders);
+        const foldersWrapper = $('.'+Hm_Utils.clean_selector(res.imap_expanded_folder_path), $('.adv_folder_list'));
+        foldersWrapper.append(folders);
         $('.imap_folder_link', list_container).addClass('adv_folder_link').removeClass('imap_folder_link');
         $('.adv_folder_link', list_container).off('click');
         $('.adv_folder_link', list_container).on("click", function() { return expand_adv_folder_list($(this).data('target')); });
         $('a', list_container).not('.adv_folder_link').off('click');
         $('a', list_container).not('.adv_folder_link').on("click", function() { adv_folder_select($(this).data('id')); return false; });
-        modifyInnerLists();
+        modifyInnerLists(foldersWrapper);
     }
 };
 
@@ -134,7 +135,7 @@ var adv_select_imap_folder = function(el) {
         $(this).find('.wrapper').append(checkboxesWrapper);
     });
 
-    modifyInnerLists();
+    modifyInnerLists(folders);
 
     $('.imap_folder_link', folders).addClass('adv_folder_link').removeClass('imap_folder_link');
     $('.adv_folder_list').html(folders.html());
@@ -150,8 +151,8 @@ var adv_select_imap_folder = function(el) {
     });
 };
 
-function modifyInnerLists() {
-    $('.adv_folder_list').find('.inner_list li').each(function(index) {
+function modifyInnerLists(foldersWrapper) {
+    foldersWrapper.find('.inner_list li').each(function(index) {
         const subFoldersCheckbox = `
         <span class="form-check form-text">
             <label class="form-check-label" for="include_subfolders-${index}">Include subfolders</label>

modules/advanced_search/site.js

@@ -97,16 +97,18 @@ public function process() {
  */
 class Hm_Handler_find_message_contacts extends Hm_Handler_Module {
     public function process() {
-        $contacts = array();
         $existing = $this->get('contact_store');
         $addr_headers = array('to', 'cc', 'bcc', 'sender', 'reply-to', 'from');
         $headers = $this->get('msg_headers', array());
         $addresses = array();
         foreach ($headers as $name => $value) {
             if (in_array(mb_strtolower($name), $addr_headers, true)) {
-                foreach (Hm_Address_Field::parse($value) as $vals) {
-                    if (!$existing->search(array('email_address' => $vals['email']))) {
-                        $addresses[] = $vals;
+                $values = is_array($value) ? $value : array($value);
+                foreach ($values as $val) {
+                    foreach (Hm_Address_Field::parse($val) as $v) {
+                        if (!$existing->search(array('email_address' => $v['email']))) {
+                            $addresses[] = $v;
+                        }
                     }
                 }
             }
@@ -391,7 +393,7 @@ protected function output() {
                         '<i class="bi bi-person-fill"></i> '.
                         '</d><td>'.$this->html_safe($c->value('type')).'<td><span class="contact_src">'.
                         ($c->value('source') == 'local' ? '' : $this->html_safe($c->value('source'))).'</span>'.
-                        '</td><td>' . $this->html_safe($name) . '</td>' .
+                        '</td><td class="contact_name_fld" data-title="' . $this->html_safe($name) . '">' . $this->html_safe($name) . '</td>' .
                         '<td><div class="contact_fld">'.$this->html_safe($c->value('email_address')).'</div></td>'.
                         '<td class="contact_fld"><a href="tel:'.$this->html_safe($c->value('phone_number')).'">'.
                         $this->html_safe($c->value('phone_number')).'</a></td>'.
@@ -411,8 +413,7 @@ protected function output() {
                             $edit_url = Hm_LDAP_Contact::addDNToUrl($c, $edit_url);
                         }
 
-                        $res .= '<a '.$delete_attrs.' class="delete_contact cursor-pointer" title="'.$this->trans('Delete').'"><i class="bi bi-trash3 text-danger ms-2"></i></a>'.
-                            '<a href="'.$edit_url.'" class="edit_contact cursor-pointer" title="'.$this->trans('Edit').'"><i class="bi bi-pencil-square ms-2"></i></a>';
+                        $res .= '<a href="'.$edit_url.'" class="edit_contact cursor-pointer" title="'.$this->trans('Edit').'"><i class="bi bi-gear ms-2"></i></a>';
                     }
 
                     $send_to_url = '?page=compose&amp;contact_id='.$this->html_safe($c->value('id')).
@@ -424,7 +425,11 @@ protected function output() {
                     }
 
                     $res .= '<a href="'.$send_to_url.'" class="send_to_contact cursor-pointer" title="'.$this->trans('Send To').'">'.
-                        '<i class="bi bi-envelope-arrow-up ms-2"></i></a>';
+                        '<i class="bi bi-file-earmark-text ms-2"></i></a>';
+                    
+                    if (in_array($c->value('type').':'.$c->value('source'), $editable, true)) {
+                        $res .= '<a '.$delete_attrs.' class="delete_contact cursor-pointer ms-3" title="'.$this->trans('Delete').'"><i class="bi bi-trash3 text-danger"></i></a>';
+                    }
 
                     $res .= '</td></tr>';
                     $res .= '<tr><td id="contact_'.$this->html_safe($c->value('id')).'_detail" class="contact_detail_row" colspan="6">';

modules/contacts/modules.php

@@ -102,8 +102,8 @@
 
 @media (max-width: 767px) {
     .add_contact_responsive {
-        width: 100%;
-        margin: 10px 0;
+        width: 95vw;
+        margin: 10px;
     }
 }
 
@@ -152,6 +152,13 @@
     text-overflow: ellipsis;
 }
 
+.contact_name_fld {
+    max-width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 #contact_csv {
     width: 80%;
 }
@@ -161,9 +168,8 @@
 }
 
 .mobile .contact_list {
-    margin-left: 0px;
-    font-size: 125%;
-    width: 100%;
+    width: 95vw;
+    margin: auto;
 }
 
 .mobile .contact_controls img {
@@ -180,6 +186,10 @@
     display: none;
 }
 
+.mobile .contact_name_fld {
+    max-width: 120px;
+}
+
 .contact_src {
     display: none;
 }

modules/contacts/site.css

@@ -264,3 +264,4 @@ var check_cc_exist_in_contacts_list = function() {
     }
     return "";
 };
+

modules/contacts/site.js

@@ -631,6 +631,13 @@ public function select_folder($folder) {
         return true;
     }
 
+    public function is_archive_folder($id, $user_config, $current_folder) {
+        if ($this->is_imap()) {
+            return is_imap_archive_folder($id, $user_config, $current_folder);
+        }
+        return false;
+    }
+
     public function get_config() {
         return $this->config;
     }

modules/core/hm-mailbox.php

@@ -116,20 +116,27 @@ class Hm_MessagesStore {
             if (messagesReadyCB) {
                 messagesReadyCB(this);
             }
+
+            responses.forEach(response => {
+                response.resolvePromise(response);
+            });
         };
 
         await Promise.all(this.fetch(hideLoadingState).map((req) => {
-            return req.then((response) => {
-                pendingResponses.set(response.sourceId, response);
+            return new Promise((resolve) => {
+                req.then((response) => {
+                    response.resolvePromise = resolve;
+                    pendingResponses.set(response.sourceId, response);
 
-                if (processingTimeout) {
-                    clearTimeout(processingTimeout);
-                }
+                    if (processingTimeout) {
+                        clearTimeout(processingTimeout);
+                    }
 
-                // Process after a short delay to allow batching
-                processingTimeout = setTimeout(processPendingResponses, 10);
-            }, (error) => {
-                console.error('Error loading messages from source:', error);
+                    // Process after a short delay to allow batching
+                    processingTimeout = setTimeout(processPendingResponses, 10);
+                }, (error) => {
+                    console.error('Error loading messages from source:', error);
+                });
             });
         }));