Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

34
app/Helpers/Mail/GmailTransport.php
View File

@ -61,41 +61,21 @@ class GmailTransport extends Transport
$this->gmail->cc($message->getCc());
$this->gmail->bcc($message->getBcc());
foreach ($message->getChildren() as $child) {
foreach ($message->getChildren() as $child)
{
nlog("trying to attach");
nlog($child->getContentType());
if($child->getContentType() != 'text/plain')
{
if($child->getContentType() != 'text/plain'){
nlog($child->getHeaders());
$this->gmail->attach(TempFile::filePath($child));
$this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
}
foreach ($message->getChildren() as $child) {
nlog("trying to attach");
}
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));
}
} //todo this should 'just work'
} //todo this should 'just work'
$this->gmail->send();

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);