Pasted pictures go with ticket emails as pictures attached inline: emailInlineImages takes each data image out of an email's HTML to uploads/tmp/mail_images, stored once by its hash, and points it at a cid that the mail queue attaches with addEmbeddedImage, so mail programs that show no data images show them and the queue keeps each picture once rather than in every email; Admin Mail Queue shows them back in the message and counts only files as attachments, a meeting request with pictures goes as an attached invite, and nightly removes pictures no queued email uses; 26.11.9 changelog entries

This commit is contained in:
johnnyq
2026-11-16 19:36:00 -05:00
parent 6eb6102dc0
commit 4faa0d91ca
8 changed files with 128 additions and 13 deletions

View File

@@ -45,14 +45,10 @@ if (!$row) { ?>
}
return escapeHtml($name) . ' <span class="text-body-secondary">&lt;' . escapeHtml($address) . '&gt;</span>';
};
$attachments = [];
foreach ((array) json_decode((string) $row['email_attachments'], true) as $attachment) {
if (is_array($attachment) && trim((string) ($attachment['name'] ?? '')) !== '') {
$attachments[] = basename((string) $attachment['name']);
}
}
// The files attached; the pictures in its message are shown in it
$attachments = mailQueueAttachments($row['email_attachments'])['files'];
$has_invite = trim((string) $row['email_cal_str']) !== '';
$content = (string) $row['email_content'];
$content = mailQueueShowImages((string) $row['email_content'], $row['email_attachments']);
$subject = trim((string) $row['email_subject']) !== '' ? escapeHtml($row['email_subject']) : '(no subject)';
// How many tries, in words