Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 06:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for gmail attachments

Browse Source
This commit is contained in:
David Bomba 2021-02-11 18:58:37 +11:00
parent a508b8f9ae
commit e11592e172
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->cc($message->getCc());
$this->gmail->bcc($message->getBcc()); $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'){
nlog($child->getHeaders());
$this->gmail->attach(TempFile::filePath($child));
}
foreach ($message->getChildren() as $child) {
nlog("trying to attach"); nlog("trying to attach");
if($child->getContentType() != 'text/plain'){ if($child->getContentType() != 'text/plain')
{
// $attachment = (new Swift_Attachment()) $this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
// ->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(); $this->gmail->send();
$this->sendPerformed($message); $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 */ /* 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); file_put_contents($file_path, $data);