Skip to content

fix: [Email] setAttachmentCID() does not work with buffer string #8446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2024
Merged

fix: [Email] setAttachmentCID() does not work with buffer string #8446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1741648
test: add tests for setAttachmentCID()
kenjis Jan 23, 2024
51d6963
fix: setAttachmentCID() does not work with buffer string
kenjis Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions system/Email/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,13 +705,23 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
public function setAttachmentCID($filename)
{
foreach ($this->attachments as $i => $attachment) {
// For file path.
if ($attachment['name'][0] === $filename) {
$this->attachments[$i]['multipart'] = 'related';

$this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][0]) . '@', true);

return $this->attachments[$i]['cid'];
}

// For buffer string.
if ($attachment['name'][1] === $filename) {
$this->attachments[$i]['multipart'] = 'related';

$this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][1]) . '@', true);

return $this->attachments[$i]['cid'];
}
}

return false;
Expand Down
51 changes: 51 additions & 0 deletions tests/system/Email/EmailTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,55 @@ private function createMockEmail(): MockEmail

return new MockEmail($config);
}

public function testSetAttachmentCIDFile(): void
{
$email = $this->createMockEmail();

$email->setFrom('[email protected]', 'Your Name');
$email->setTo('[email protected]');

$filename = SUPPORTPATH . 'Images/ci-logo.png';
$email->attach($filename);
$cid = $email->setAttachmentCID($filename);
$email->setMessage('<img src="cid:' . $cid . '" alt="CI Logo">');

$this->assertTrue($email->send());

$this->assertStringStartsWith('ci-logo.png@', $cid);
$this->assertStringStartsWith(
'ci-logo.png@',
$email->archive['attachments'][0]['cid']
);
$this->assertMatchesRegularExpression(
'/<img src="cid:ci-logo.png@(.+?)" alt="CI Logo">/u',
$email->archive['body']
);
}

public function testSetAttachmentCIDBufferString(): void
{
$email = $this->createMockEmail();

$email->setFrom('[email protected]', 'Your Name');
$email->setTo('[email protected]');

$filename = SUPPORTPATH . 'Images/ci-logo.png';
$imageData = file_get_contents($filename);
$email->attach($imageData, 'inline', 'image001.png', 'image/png');
$cid = $email->setAttachmentCID('image001.png');
$email->setMessage('<img src="cid:' . $cid . '" alt="CI Logo">');

$this->assertTrue($email->send());

$this->assertStringStartsWith('image001.png@', $cid);
$this->assertStringStartsWith(
'image001.png@',
$email->archive['attachments'][0]['cid']
);
$this->assertMatchesRegularExpression(
'/<img src="cid:image001.png@(.+?)" alt="CI Logo">/u',
$email->archive['body']
);
}
}