tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4874 from turbo124/v5-develop

Browse source 
Fixes for gmail attachments
This commit is contained in:
David Bomba 2021-02-11 18:59:05 +11:00 • committed by GitHub
commit 914c27062f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/Helpers/Mail/GmailTransport.php
View file

@ -61,42 +61,22 @@ class GmailTransport extends Transport
$this->gmail->cc($message->getCc());
$this->gmail->bcc($message->getBcc());
foreach ($message->getChildren() as $child) {
nlog("trying to attach");
nlog($child->getContentType());
foreach ($message->getChildren() as $child)
{
if($child->getContentType() != 'text/plain'){
nlog($child->getHeaders());
$this->gmail->attach(TempFile::filePath($child));
}
foreach ($message->getChildren() as $child) {
nlog("trying to attach");
if($child->getContentType() != 'text/plain'){
if($child->getContentType() != 'text/plain')
{
// $attachment = (new Swift_Attachment())
// ->setFilename($child->getHeaders()->get('Content-Type')->getParameter('name'))
// ->setContentType($child->getContentType())
// ->setBody($child->getBody());
$this->gmail->attach(new Swift_Attachment($child));
$this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
}
} //todo this should 'just work'
}
} //todo this should 'just work'
$this->gmail->send();
$this->sendPerformed($message);

4
app/Utils/TempFile.php
View file

@ -22,10 +22,10 @@ class TempFile
}
/* Downloads a file to temp storage and returns the path - used for mailers */
public static function filePath($data) :string
public static function filePath($data, $filename) :string
{
$file_path = sys_get_temp_dir().'/'.sha1(microtime());
$file_path = sys_get_temp_dir().'/'.sha1(microtime() . '/' . $filename);
file_put_contents($file_path, $data);