Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-19 04:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

continue mail implementation

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-04-11 19:09:13 +02:00
parent 1ec7e62756
commit 340ea049eb
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Message/Mail/Mail.php
View File

@ -434,8 +434,9 @@ class Mail
'name' => $name,
'encoding' => $encoding,
'type' => $type,
'string' => false,
'disposition' => $disposition,
'???' => $name,
'id' => $name,
];
$this->setMessageType();
@ -997,7 +998,39 @@ class Mail
$incl = [];
foreach ($this->attachment as $attach) {
if ($attach['disposition'] === $disposition) {
$text = '';
$path = '';
$isString = $attach['string'];
if (!empty($isString)) {
$text = $attach['path'];
} else {
$path = $attach['path'];
}
$hash = \hash('sha256', \serialize($attach));
if (\in_array($hash, $incl, true)) {
continue;
}
$incl[] = $hash;
if ($attach['disposition'] && isset($cid[$attach['id']])) {
continue;
}
$cid[$attach['id']] = true;
$mime[] = '--' . $boundary . $this->endOfLine;
$mime[] = !empty($attach['name'])
? 'Content-Type: ' . $attach['type'] . '; name="' . $this->encodeHeader($this->secureHeader($attach['name'])) . '"' . $this->endOfLine
: 'Content-Type: ' . $attach['type'] . $this->endOfLine;
if ($attach['encoding'] !== EncodingType::E_7BIT) {
$mime[] = 'Content-Transfer-Encoding: ' . $attach['encoding'] . $this->endOfLine;
}
}
}
$mime[] = '--' . $boundary . '--' . $this->endOfLine;