Skip to content
Snippets Groups Projects
Commit eb9b1ce3 authored by Stefan Galinski's avatar Stefan Galinski :video_game:
Browse files

[BUGFIX] Fix mail queue finally

parent 18a735a6
No related branches found
No related tags found
No related merge requests found
......@@ -59,10 +59,9 @@ class SendMailCommandController extends CommandController {
/** @var Mail $mailToSend */
$fromAddress = $mailToSend->getFromAddress();
$toAddress = $mailToSend->getToAddress();
$ccAddresses = GeneralUtility::trimExplode(',', $mailToSend->getCcAddresses());
$bccAddresses = GeneralUtility::trimExplode(',', $mailToSend->getBccAddresses());
$ccAddresses = GeneralUtility::trimExplode(',', $mailToSend->getCcAddresses(), TRUE);
$bccAddresses = GeneralUtility::trimExplode(',', $mailToSend->getBccAddresses(), TRUE);
$mailSubject = $mailToSend->getMailSubject();
$fromName = $mailToSend->getFromName();
$mailBody = $mailToSend->getMailBody();
$mailToSend->setSent(TRUE);
......@@ -75,12 +74,19 @@ class SendMailCommandController extends CommandController {
$mailMessage->setFrom($fromAddress);
$mailMessage->setTo($toAddress);
$mailMessage->setSubject($mailSubject);
$mailMessage->setCc($ccAddresses);
$mailMessage->setBcc($bccAddresses);
$mailMessage->setFrom($fromName);
if (count($ccAddresses)) {
$mailMessage->setCc($ccAddresses);
}
if (count($bccAddresses)) {
$mailMessage->setBcc($bccAddresses);
}
$mailMessage->setBody($mailBody, 'text/html');
$mailMessage->send();
try {
$mailMessage->send();
} catch (\Exception $exception) {
// @TODO proper error handling is missing, save this into the database?
}
}
// Important for command controllers that change data
......
......@@ -94,11 +94,6 @@ class MailTemplateService {
*/
private $markers = [];
/**
* @var string $subject
*/
private $subject;
/**
* holds the TypoScript configuration for sg_mail
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment