diff --git a/app/Services/EmailSender.php b/app/Services/EmailSender.php index c34947f..06d66a3 100644 --- a/app/Services/EmailSender.php +++ b/app/Services/EmailSender.php @@ -152,19 +152,6 @@ public function sendFromLog(EmailLog $log): array $email->to(new Address($singleTo, (string) ($log->to_name ?? ''))); } - // Always BCC the sender mailbox if present and not already in To - $senderBcc = null; - if ($fromAddr !== '' && filter_var($fromAddr, FILTER_VALIDATE_EMAIL)) { - // Check duplicates against toList - $lowerTo = array_map(fn ($v) => strtolower(trim((string) $v)), (array) ($log->to_recipients ?? [$log->to_email])); - if (! in_array(strtolower($fromAddr), $lowerTo, true)) { - $senderBcc = $fromAddr; - $email->bcc(new Address($senderBcc)); - // Persist BCC for auditing - $log->bcc = [$senderBcc]; - } - } - if (! empty($text)) { $email->text($text); } @@ -304,10 +291,6 @@ public function sendFromLog(EmailLog $log): array } $mailer->send($email); - // Save log if we modified BCC - if (! empty($log->getAttribute('bcc'))) { - $log->save(); - } $headers = $email->getHeaders(); $messageIdHeader = $headers->get('Message-ID'); $messageId = $messageIdHeader ? $messageIdHeader->getBodyAsString() : null; @@ -330,15 +313,6 @@ public function sendFromLog(EmailLog $log): array $message->to($singleTo); } } - // BCC the sender mailbox if resolvable and not already in To - $fromAddr = (string) ($log->from_email ?: (config('mail.from.address') ?? '')); - if ($fromAddr !== '' && filter_var($fromAddr, FILTER_VALIDATE_EMAIL)) { - $lowerTo = array_map(fn ($v) => strtolower(trim((string) $v)), (array) ($log->to_recipients ?? [$log->to_email])); - if (! in_array(strtolower($fromAddr), $lowerTo, true)) { - $message->bcc($fromAddr); - $log->bcc = [$fromAddr]; - } - } $message->subject($subject); if (! empty($log->reply_to)) { $message->replyTo($log->reply_to); @@ -464,15 +438,6 @@ public function sendFromLog(EmailLog $log): array $message->to($singleTo); } } - // BCC the sender mailbox if resolvable and not already in To - $fromAddr = (string) ($log->from_email ?: (config('mail.from.address') ?? '')); - if ($fromAddr !== '' && filter_var($fromAddr, FILTER_VALIDATE_EMAIL)) { - $lowerTo = array_map(fn ($v) => strtolower(trim((string) $v)), (array) ($log->to_recipients ?? [$log->to_email])); - if (! in_array(strtolower($fromAddr), $lowerTo, true)) { - $message->bcc($fromAddr); - $log->bcc = [$fromAddr]; - } - } $message->subject($subject); if (! empty($log->reply_to)) { $message->replyTo($log->reply_to);