fix(backend): restore archive_items & keep it the way Exchange was supposed to work

Author: Shadow243

modules/imap/hm-ews.php

@@ -1098,40 +1098,28 @@ protected function is_distinguished_folder(&$folder) {
 
     protected function archive_items($itemIds) {
         $result = true;
-        try {
-            $archiveFolder = null;
+        $folders = $this->get_parent_folders_of_items($itemIds);
+        foreach ($folders as $folder => $itemIds) {
+            if ($this->is_distinguished_folder($folder)) {
+                $folder = new Type\DistinguishedFolderIdType($folder);
+            } else {
+                $folder = new Type\FolderIdType($folder);
+            }
+            $request = [
+                'ArchiveSourceFolderId' => $folder->toArray(true),
+                'ItemIds' => [
+                    'ItemId' => $itemIds = array_map(function($itemId) {
+                        return (new Type\ItemIdType($itemId))->toArray();
+                    }, $itemIds),
+                ]
+            ];
+            $request = Type::buildFromArray($request);
             try {
-                $archiveFolder = $this->api->getFolderByDistinguishedId(Enumeration\DistinguishedFolderIdNameType::ARCHIVE_INBOX);
+                $result = $result && $this->ews->ArchiveItem($request);
             } catch (\Exception $e) {
-                try {
-                    $rootFolder = new Type\DistinguishedFolderIdType(Enumeration\DistinguishedFolderIdNameType::MESSAGE_ROOT);
-                    $createRequest = [
-                        'Folders' => ['Folder' => [
-                            'DisplayName' => 'Archive'
-                        ]],
-                        'ParentFolderId' => $rootFolder->toArray(true),
-                    ];
-                    $createResult = $this->ews->CreateFolder($createRequest);
-                    $archiveFolder = $this->api->getFolderByDisplayName('Archive', Enumeration\DistinguishedFolderIdNameType::MESSAGE_ROOT);
-                } catch (\Exception $createE) {
-                    Hm_Msgs::add('Unable to create or find archive folder: ' . $createE->getMessage(), 'danger');
-                    return false;
-                }
-            }
-            
-            if (!$archiveFolder) {
-                Hm_Msgs::add('Archive folder not available', 'danger');
-                return false;
+                Hm_Msgs::add($e->getMessage(), 'danger');
+                $result = false;
             }
-
-            // use move_items to archive the items
-            $archiveFolderId = $archiveFolder->getFolderId()->getId();
-            $newIds = $this->move_items($itemIds, $archiveFolderId);
-            $result = !empty($newIds);
-            
-        } catch (\Exception $e) {
-            Hm_Msgs::add('Archive operation failed: ' . $e->getMessage(), 'danger');
-            $result = false;
         }
         return $result;
     }