Merge pull request #1252 from michalkleiner/pulls/1203-attach-file-per-recipient-hook
Add extension hook to control file attachments per recipient and field
This commit is contained in:
commit
4b85a33b5d
|
@ -355,7 +355,8 @@ JS
|
|||
|
||||
// attach a file to recipient email only if lower than configured size
|
||||
if ($file->getAbsoluteSize() <= $this->getMaximumAllowedEmailAttachmentSize()) {
|
||||
$attachments[] = $file;
|
||||
// using the field name as array index is fine as file upload field only allows one file
|
||||
$attachments[$field->Name] = $file;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -393,12 +394,16 @@ JS
|
|||
$mergeFields = $this->getMergeFieldsMap($emailData['Fields']);
|
||||
|
||||
if ($attachments && (bool) $recipient->HideFormData === false) {
|
||||
foreach ($attachments as $file) {
|
||||
foreach ($attachments as $uploadFieldName => $file) {
|
||||
/** @var File $file */
|
||||
if ((int) $file->ID === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$canAttachFileForRecipient = true;
|
||||
$this->extend('updateCanAttachFileForRecipient', $canAttachFileForRecipient, $recipient, $uploadFieldName, $file);
|
||||
|
||||
if ($canAttachFileForRecipient) {
|
||||
$email->addAttachmentFromData(
|
||||
$file->getString(),
|
||||
$file->getFilename(),
|
||||
|
@ -406,6 +411,7 @@ JS
|
|||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$recipient->SendPlain && $recipient->emailTemplateExists()) {
|
||||
$email->setHTMLTemplate($recipient->EmailTemplate);
|
||||
|
|
Loading…
Reference in New Issue