Merge pull request #12 from ByteParty/fix-file-count

send more than one file
slub · Nov 26, 2021 · 11bc699 · 11bc699
2 parents fa88632 + 4c7a86a
commit 11bc699
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Classes/Controller/EmailController.php b/Classes/Controller/EmailController.php
@@ -152,6 +152,8 @@ public function createAction(\Slub\SlubForms\Domain\Model\Email $newEmail, array
 
         $form = $this->formsRepository->findAllById($newEmail->getForm())->getFirst();
 
+        $fileNames = [];
+
         // walk through all fieldsets
         foreach($fieldParameter as $getfieldset => $getfields) {
 
@@ -211,6 +213,7 @@ public function createAction(\Slub\SlubForms\Domain\Model\Email $newEmail, array
                                 $_FILES['tx_slubforms_sf']['tmp_name']['field'][$getfieldset][$field->getUid()],
                                 $fileName
                             );
+                            $fileNames[] = $fileName;
                         } else {
 
                             $content[$field->getTitle()] = '-';
@@ -341,14 +344,16 @@ public function createAction(\Slub\SlubForms\Domain\Model\Email $newEmail, array
                 array(	'email' => $newEmail,
                     'form' => $form,
                     'content' => $content,
-                    'filename' => $fileName,
+                    'filenames' => $fileNames,
                     'settings' => $this->settings,
                 )
             );
 
-            // remove $filename from uploads-directory
-            if (!empty($fileName)) {
-                unlink($fileName);
+            // remove $fileNames from uploads-directory
+            if (!empty($fileNames)) {
+                foreach ($fileNames as $fileName) {
+                    unlink($fileName);
+                }
             }
 
         }
@@ -455,8 +460,11 @@ protected function sendTemplateEmail(array $recipient, array $sender, $subject,
         // HTML Email
         $message->addPart($emailTextHTML, 'text/html');
 
-        if (!empty($variables['filename']))
-            $message->attach(\Swift_Attachment::fromPath($variables['filename']));
+        if (!empty($variables['filenames'])){
+            foreach ($variables['filenames'] as $fileName) {
+                $message->attach(\Swift_Attachment::fromPath($fileName));
+            }
+        }
 
         $message->send();