Merge pull request #21869 from fboitel/imap-by-oauth2-attachment

Imap by oauth2 attachments

htdocs/emailcollector/class/emailcollector.class.php

@@ -1582,7 +1582,9 @@ class EmailCollector extends CommonObject
 						$plainmsg = $imapemail->getTextBody();
 					}
 					if ($imapemail->hasAttachments()) {
-						$attachments = $imapemail->getAttachments();
+						$attachments = $imapemail->getAttachments()->all();
+					} else {
+						$attachments = [];
 					}
 				} else {
 					$this->getmsg($connection, $imapemail);
@@ -2440,6 +2442,20 @@ class EmailCollector extends CommonObject
 										$errorforactions++;
 										$this->error = 'Failed to create project: '.$langs->trans($projecttocreate->error);
 										$this->errors = $projecttocreate->errors;
+									} else {
+										if ($attachments) {
+											$destdir = $conf->project->dir_output.'/'.$projecttocreate->ref;
+											if (!dol_is_dir($destdir)) {
+												dol_mkdir($destdir);
+											}
+											if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+												foreach ($attachments as $attachment) {
+													$attachment->save($destdir.'/');
+												}
+											} else {
+												$this->getmsg($connection, $imapemail, $destdir);
+											}
+										}
 									}
 								}
 							}
@@ -2550,13 +2566,16 @@ class EmailCollector extends CommonObject
 										$this->errors = $tickettocreate->errors;
 									} else {
 										if ($attachments) {
-											if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 											$destdir = $conf->ticket->dir_output.'/'.$tickettocreate->ref;
 											if (!dol_is_dir($destdir)) {
-													return -1;
 												dol_mkdir($destdir);
-													$this->getmsg($connection, $imapemail, $destdir);
 											}
+											if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+												foreach ($attachments as $attachment) {
+													$attachment->save($destdir.'/');
+												}
+											} else {
+												$this->getmsg($connection, $imapemail, $destdir);
 											}
 										}
 									}

htdocs/includes/webklex/php-imap/deleted.txt

@@ -13,4 +13,5 @@
 ./vendor/phpdocumentor
 ./vendor/nesbot/carbon/src/Carbon/Lang
 ./vendor/doctrine
+./vendor/bin
 ./tests

htdocs/includes/webklex/php-imap/vendor/composer/autoload_static.php

@@ -31,7 +31,7 @@ class ComposerStaticInit4da13270269c89a28e472e1f7324e6d1
         ),
         'T' =>
         array (
-            'Tests\\' => 6,
+            // 'Tests\\' => 6,
         ),
         'S' =>
         array (