lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Embed images

Browse Source
This commit is contained in:
frederic34 2016-04-17 10:28:21 +02:00
parent 8428b791f8
commit 75127638a4
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails.php
View File

@ -207,7 +207,7 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE
$msgishtml, $msgishtml,
$errors_to, $errors_to,
'', '',
$trackid $trackid
); );
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();

37
htdocs/core/class/CMailFile.class.php
View File

@ -361,6 +361,14 @@ class CMailFile
// Create the message // Create the message
$this->message = Swift_Message::newInstance(); $this->message = Swift_Message::newInstance();
// Adding a trackid header to a message
$headers = $this->message->getHeaders();
$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid);
$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $conf->global->MAIN_MAIL_SMTP_SERVER;
$msgid = $headers->get('Message-ID');
$msgid->setId($headerID);
$headers->addIdHeader('References', $headerID);
// Give the message a subject // Give the message a subject
$this->message->setSubject($this->encodetorfc2822($subject)); $this->message->setSubject($this->encodetorfc2822($subject));
@ -375,8 +383,6 @@ class CMailFile
$this->message->setCharSet($conf->file->character_set_client); $this->message->setCharSet($conf->file->character_set_client);
// TODO Add trackid into smtp header
if (! empty($this->html)) if (! empty($this->html))
{ {
if (!empty($css)) if (!empty($css))
@ -388,6 +394,19 @@ class CMailFile
$msg = $this->checkIfHTML($msg); $msg = $this->checkIfHTML($msg);
} }
if ($this->atleastoneimage)
{
foreach ($this->images_encoded as $img)
{
//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
$attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
// embed image
$imgcid = $this->message->embed($attachment);
// replace cid by the one created by swiftmail in html message
$msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
}
}
if ($this->msgishtml) { if ($this->msgishtml) {
$this->message->setBody($msg,'text/html'); $this->message->setBody($msg,'text/html');
// And optionally an alternative body // And optionally an alternative body
@ -398,19 +417,6 @@ class CMailFile
//$this->message->addPart('<q>Here is the message itself</q>', 'text/html'); //$this->message->addPart('<q>Here is the message itself</q>', 'text/html');
} }
if ($this->atleastoneimage)
{
foreach ($this->images_encoded as $img)
{
//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
// TODO this part is not tested
//$attachment = Swift_Attachment::fromPath($img['fullpath'], 'image/jpeg');
//$attachment->setFilename($img['name']);
//$attachment->setDisposition('inline');
//$message->attach($attachment);
}
}
if ($this->atleastonefile) if ($this->atleastonefile)
{ {
foreach ($filename_list as $i => $val) foreach ($filename_list as $i => $val)
@ -1175,6 +1181,7 @@ class CMailFile
$imgName = $regs[1]; $imgName = $regs[1];
$this->images_encoded[$i]['name'] = $imgName; $this->images_encoded[$i]['name'] = $imgName;
$this->images_encoded[$i]['fullpath'] = $fullpath;
$this->images_encoded[$i]['content_type'] = $img["content_type"]; $this->images_encoded[$i]['content_type'] = $img["content_type"];
$this->images_encoded[$i]['cid'] = $img["cid"]; $this->images_encoded[$i]['cid'] = $img["cid"];
// Encodage de l'image // Encodage de l'image