Merge pull request #1635 from kambereBr/apply-ews-patch

fix(backend): fix EWS issues and enhance interoperability

Author: kroky

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

@@ -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;
+                        }
                     }
                 }
             }

modules/contacts/modules.php

@@ -250,7 +250,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
         else {
             $from = $msg['from'];
         }
-        $from = format_imap_from_fld($from);
+        $from = format_imap_from_fld(is_array($from) ? implode(', ', $from) : $from);
         $nofrom = '';
         if (!trim($from)) {
             $from = '[No From]';

modules/imap/functions.php

@@ -559,9 +559,29 @@ public function process() {
                     if (array_key_exists('folder_label', $this->request->get)) {
                         $folder = $this->request->get['folder_label'];
                         $this->out('folder_label', $folder);
+                    } else {
+                        $folder = hex2bin($parts[2]);
                     }
+                    
                     $mailbox = Hm_IMAP_List::get_mailbox_without_connection($details);
                     $label = $mailbox->get_folder_name($folder);
+                    if(!$label) {
+                        if ($this->config->get('allow_session_cache', false)) {
+                            $paths = explode("_", $path);
+                            $short_path = $paths[0] . "_" . $paths[1] . "_";
+                            $cached_folders = $this->cache->get('imap_folders_'.$short_path, true);
+                            $label = !empty($cached_folders[$folder]['name']) ? $cached_folders[$folder]['name'] : '';
+                        } else {
+                            Hm_Msgs::add('Folder name loaded directly from the server. This may be slower. Enable session caching for better performance.', 'warning');
+                            if (isset($details['type']) && $details['type'] === 'ews') {
+                                $connected_mailbox = Hm_IMAP_List::get_connected_mailbox($parts[1], $this->cache);
+                                if ($connected_mailbox && $connected_mailbox->authed()) {
+                                    $folder_status = $connected_mailbox->get_folder_status($folder, false);
+                                    $label = $folder_status['name'] ?? null;
+                                }
+                            }
+                        }
+                    }
                     $title = array(strtoupper($details['type'] ?? 'IMAP'), $details['name'], $label);
                     if ($this->get('list_page', 0)) {
                         $title[] = sprintf('Page %d', $this->get('list_page', 0));
@@ -932,7 +952,7 @@ public function process() {
         }
 
         $mailbox = Hm_IMAP_List::get_connected_mailbox($form['imap_server_id'], $this->cache);
-        if ($mailbox && ! $mailbox->is_imap() && empty($archive_folder)) {
+        if ($mailbox && ! $mailbox->is_imap()) {
             // EWS supports archiving to user archive folders
             $status = $mailbox->message_action($form_folder, 'ARCHIVE', array($form['imap_msg_uid']))['status'];
         } else {
@@ -1588,6 +1608,7 @@ public function process() {
                 ];
                 $this->user_config->set('special_imap_folders', $specials);
             }
+            Hm_Msgs::add("EWS server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
             $this->session->record_unsaved('EWS server added');
             $this->session->secure_cookie($this->request, 'hm_reload_folders', '1');
         }
@@ -1992,6 +2013,7 @@ public function process() {
 
         $mailbox = Hm_IMAP_List::get_connected_mailbox($server_id, $this->cache);
         if ($mailbox && $mailbox->authed()) {
+            $prefetch = true;
             $mailbox->set_read_only($prefetch);
             $part = false;
             list($msg_struct, $msg_struct_current, $msg_text, $part) = $mailbox->get_structured_message(hex2bin($folder), $uid, $part, $this->user_config->get('text_only_setting', false));