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

@@ -39,7 +39,7 @@ $search = "(email_id LIKE '%$q%' OR email_from LIKE '%$q%' OR email_from_name LI
AND DATE(email_queued_at) BETWEEN '$dtf' AND '$dtt'";
$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS email_id, email_status, email_attempts, email_from, email_from_name, email_recipient, email_recipient_name,
email_subject, email_queued_at, email_failed_at, email_sent_at, " . mailQueueErrorColumn() . ", COALESCE(email_attachments, '') <> '' AS has_attachments, COALESCE(email_cal_str, '') <> '' AS has_invite, email_content = '' AS email_cleared
email_subject, email_queued_at, email_failed_at, email_sent_at, " . mailQueueErrorColumn() . ", email_attachments, COALESCE(email_cal_str, '') <> '' AS has_invite, email_content = '' AS email_cleared
FROM email_queue
WHERE $search AND {$tabs[$show][2]}
ORDER BY {$sortable_columns[$sort]}, email_id DESC
@@ -182,6 +182,8 @@ $filtered_dates = isset($_GET['dtf']) && $_GET['dtf'] !== '' && $_GET['dtf'] !==
<?php while ($row = mysqli_fetch_assoc($sql)) {
$email_id = intval($row['email_id']);
$state = mailQueueState($row);
// Files attached - not the pictures in its message
$row['has_attachments'] = (bool) mailQueueAttachments($row['email_attachments'])['files'];
$subject = trim((string) $row['email_subject']) !== '' ? escapeHtml($row['email_subject']) : '<span class="text-body-secondary">(no subject)</span>';
$view = 'data-modal-size="lg" data-modal-url="modals/mail_queue/mail_queue_message_view.php?id=' . $email_id . '"';
$from = $person($row['email_from_name'], $row['email_from']);