Merge pull request #27227 from glu000/18.0-fix-27226

Fix #27226
This commit is contained in:
Laurent Destailleur 2023-12-27 14:34:16 +01:00 committed by GitHub
commit ea7e0686df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1128,6 +1128,8 @@ class EmailCollector extends CommonObject
$this->fetchFilters();
$this->fetchActions();
$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
if ($this->acces_type == 1) {
// Mode OAUth2 with PHP-IMAP
@ -1233,7 +1235,6 @@ class EmailCollector extends CommonObject
return -2;
}
$sourcedir = $this->source_directory;
$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
$connectstringserver = $this->getConnectStringIMAP();
$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);