EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
fix IMAP folders
Yurii79d5cd60c9dc
diff --git a/application/Espo/Core/Mail/Account/Fetcher.php b/application/Espo/Core/Mail/Account/Fetcher.phpindex 8fea97d79b..33d29501e1 100644--- a/application/Espo/Core/Mail/Account/Fetcher.php+++ b/application/Espo/Core/Mail/Account/Fetcher.php@@ -110,7 +110,7 @@ class Fetcher$folder = mb_convert_encoding($folderOriginal, 'UTF7-IMAP', 'UTF-8');try {- $storage->selectFolder($folder);+ $storage->selectFolder($folderOriginal);} catch (Throwable $e) {$message = "{$account->getEntityType()} {$account->getId()}, " ."could not select folder '$folder'; {$e->getMessage()}";diff --git a/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php b/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.phpindex a1038d0933..2a2ab94c02 100644--- a/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php+++ b/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php@@ -244,7 +244,7 @@ class DirectoryTreeStorage implements Storage$folders = $this->mailbox->folders()->get();foreach ($folders as $folder) {- $output[] = $folder->path();+ $output[] = mb_convert_encoding($folder->path(), 'UTF-8', 'UTF7-IMAP');}} catch (CommonException $e) {throw new ImapError($e->getMessage(), previous: $e);