AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-11 00:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta Mail Parser Add inline images as attachments keeps the DB clean

Browse Source
This commit is contained in:
johnnyq
2026-02-26 16:30:29 -05:00
parent 9cb1ff7330
commit 87fd23f443
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cron/beta_email_parser.php
View File

@@ -722,31 +722,47 @@ foreach ($messages as $message) {
// ignore inline replacement errors // ignore inline replacement errors
} }
// Collect non-inline attachments from the high-level Attachment API // Attachments (inline CID replacement + collect non-inline)
$attachments = [];
$inline_cids = [];
try { try {
foreach ($message->attachments() as $att) { foreach ($message->attachments() as $att) {
if (!$att) continue; $name = $att->filename() ?: 'attachment';
$content = (string)$att->contents();
$cid = $att->contentId(); // Content-ID for inline parts
$mime = (string)($att->contentType() ?: 'application/octet-stream');
$name = $att->filename() ?: 'attachment'; // If it has a CID, attempt to inline it into the HTML body
$content = $att->contents(); if (!empty($cid) && !empty($message_body)) {
$cid = null; $cid_trim = trim((string)$cid, "<> \t\r\n");
try { $cid = $att->contentId(); } catch (\Throwable $e) { $cid = null; }
$cid_trim = $cid ? trim((string)$cid, "<> \t\r\n") : null;
// Skip inline ones we already embedded // Only inline if the body actually references it (prevents incorrectly hiding real attachments)
if ($cid_trim && isset($inline_cids[$cid_trim])) { // Covers: src="cid:abc", src="cid:<abc>", etc.
continue; if ($cid_trim !== '' && preg_match('/cid:\s*<?' . preg_quote($cid_trim, '/') . '>?/i', $message_body)) {
$dataUri = "data:$mime;base64," . base64_encode($content);
$message_body = str_replace(
["cid:$cid_trim", "cid:<$cid_trim>", "cid:$cid"],
$dataUri,
$message_body
);
$inline_cids[$cid_trim] = true;
continue; // don't save as a ticket attachment
}
} }
if ($content !== null && $content !== '') { // Otherwise treat it as a normal attachment
if ($content !== '') {
$attachments[] = [ $attachments[] = [
'name' => $name, 'name' => $name,
'content' => $content, 'content' => $content
]; ];
} }
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
// ignore // ignore attachment parse errors
} }
// 1. Reply to existing ticket with the number in subject // 1. Reply to existing ticket with the number in subject