espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2.7.1'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2014-11-26 14:54:50 +02:00
parent 4908f281a3 79dfd6177a
commit 6e49afddf0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Services/InboundEmail.php
+4 -2
View File
@@ -116,7 +116,7 @@ class InboundEmail extends \Espo\Services\Record
$folders = new \RecursiveIteratorIterator($storage->getFolders(), \RecursiveIteratorIterator::SELF_FIRST);
foreach ($folders as $name => $folder) {
$foldersArr[] = $folder->getGlobalName();
$foldersArr[] = mb_convert_encoding($folder->getGlobalName(), 'UTF-8', 'UTF7-IMAP');
}
return $foldersArr;
}
@@ -168,9 +168,11 @@ class InboundEmail extends \Espo\Services\Record
$monitoredFoldersArr = explode(',', $monitoredFolders);
foreach ($monitoredFoldersArr as $folder) {
$folder = trim($folder);
$folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
$storage->selectFolder($folder);
$lastUID = 0;
$lastDate = 0;
if (!empty($fetchData['lastUID'][$folder])) {
application/Espo/Services/EmailAccount.php
+3 -2
View File
@@ -87,7 +87,7 @@ class EmailAccount extends Record
$folders = new \RecursiveIteratorIterator($storage->getFolders(), \RecursiveIteratorIterator::SELF_FIRST);
foreach ($folders as $name => $folder) {
$foldersArr[] = $folder->getGlobalName();
$foldersArr[] = mb_convert_encoding($folder->getGlobalName(), 'UTF-8', 'UTF7-IMAP');
}
return $foldersArr;
}
@@ -152,7 +152,8 @@ class EmailAccount extends Record
$monitoredFoldersArr = explode(',', $monitoredFolders);
foreach ($monitoredFoldersArr as $folder) {
$folder = trim($folder);
$folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
$storage->selectFolder($folder);
$lastUID = 0;