Attachment testing.

tomshaw · Apr 1, 2024 · a09dcd0 · a09dcd0
1 parent b608019
commit a09dcd0
Showing 1 changed file with 13 additions and 23 deletions.
diff --git a/src/Api/GoogleMail.php b/src/Api/GoogleMail.php
@@ -357,34 +357,24 @@ protected function buildMessage(array $validated): string
         }
         $headers .= "Subject: {$validated['subject']}\r\n";
         $headers .= "MIME-Version: 1.0\r\n";
+        $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\r\n\r\n";
 
-        if (! empty($this->attachments)) {
-            $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\r\n\r\n";
+        foreach ($this->attachments as $attachment) {
+            $attachmentData = base64_encode(file_get_contents($attachment));
 
-            // Add the text part
             $headers .= "--$boundary\r\n";
-            $headers .= "Content-Type: text/html; charset=utf-8\r\n";
-            $headers .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
-            $headers .= "{$validated['message']}\r\n\r\n";
-
-            // Add each attachment
-            foreach ($this->attachments as $attachment) {
-                $attachmentData = base64_encode(file_get_contents($attachment));
-
-                $headers .= "--$boundary\r\n";
-                $headers .= 'Content-Type: '.mime_content_type($attachment).'; name="'.basename($attachment)."\"\r\n";
-                $headers .= "Content-Transfer-Encoding: base64\r\n\r\n";
-                $headers .= $attachmentData."\r\n\r\n";
-            }
-
-            // End the email
-            $headers .= "--$boundary--";
-        } else {
-            $headers .= "Content-Type: text/html; charset=utf-8\r\n";
-            $headers .= 'Content-Transfer-Encoding: 8bit'."\r\n\r\n";
-            $headers .= $validated['message'];
+            $headers .= 'Content-Type: '.mime_content_type($attachment).'; name="'.basename($attachment)."\"\r\n";
+            $headers .= "Content-Transfer-Encoding: base64\r\n\r\n";
+            $headers .= $attachmentData."\r\n\r\n";
         }
 
+        $headers .= "--$boundary\r\n";
+        $headers .= "Content-Type: text/html; charset=utf-8\r\n";
+        $headers .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
+        $headers .= "{$validated['message']}\r\n\r\n";
+
+        $headers .= "--$boundary--";
+
         return $headers;
     }