Skip to content

Fixes #73. Added additonal config parameter outputInBody #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
forsvunnet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #73. Added additonal config parameter outputInBody #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/GO/Traits/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ public function getEmailConfig()
$this->emailConfig['from'] = ['cronjob@server.my' => 'My Email Server'];
}

$outputInBody = ! empty($this->emailConfig['outputInBody']);

if (! isset($this->emailConfig['body']) ||
! is_string($this->emailConfig['body'])
) {
$this->emailConfig['body'] = 'Cronjob output attached';
$this->emailConfig['body'] = $outputInBody ? 'Cronjob output:' . PHP_EOL : 'Cronjob output attached';
}

if (! isset($this->emailConfig['transport']) ||
Expand All @@ -46,15 +48,25 @@ private function sendToEmails(array $files)

$mailer = new \Swift_Mailer($config['transport']);

$body = $config['body'];

$outputInBody = ! empty($this->emailConfig['outputInBody']);

if ($outputInBody) {
$body .= implode(PHP_EOL, $this->output);
}
$message = (new \Swift_Message())
->setSubject($config['subject'])
->setFrom($config['from'])
->setTo($this->emailTo)
->setBody($config['body'])
->addPart('<q>Cronjob output attached</q>', 'text/html');
->setBody($body);

if (! $outputInBody) {
$message->addPart('<q>Cronjob output attached</q>', 'text/html');

foreach ($files as $filename) {
$message->attach(\Swift_Attachment::fromPath($filename));
foreach ($files as $filename) {
$message->attach(\Swift_Attachment::fromPath($filename));
}
}

$mailer->send($message);
Expand Down