sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed attachemnts not working on production

Browse Source
This commit is contained in:
Simon Pocrnjič 2025-10-18 19:53:23 +02:00
parent 3b1a24287a
commit f54f198879
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Services/EmailSender.php
View File

@ -186,9 +186,35 @@ public function sendFromLog(EmailLog $log): array
} }
$name = $att['name'] ?? basename($path); $name = $att['name'] ?? basename($path);
$mime = $att['mime'] ?? 'application/octet-stream'; $mime = $att['mime'] ?? 'application/octet-stream';
$full = \Storage::disk($disk)->path($path);
if (is_file($full)) { $attached = false;
$email->attachFromPath($full, $name, $mime); $storage = \Storage::disk($disk);
// Prefer local path when available (local driver)
try {
if (method_exists($storage, 'path')) {
$full = $storage->path($path);
if (is_string($full) && is_file($full)) {
$email->attachFromPath($full, $name, $mime);
$attached = true;
}
}
} catch (\Throwable $e) {
// fall through to bytes
}
if (! $attached) {
// Fallback for non-local disks (e.g., S3): read bytes and attach directly
try {
if ($storage->exists($path)) {
$bytes = $storage->get($path);
if (! is_null($bytes) && $bytes !== false) {
$email->attach($bytes, $name, $mime);
$attached = true;
}
}
} catch (\Throwable $e) {
// ignore, continue to next attachment
}
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
// ignore individual attachment failures; continue sending // ignore individual attachment failures; continue sending