Skip to content

[TASK] respect sender.default.senderEmail for sender mail TO fallback #742

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[TASK] respect sender.default.senderEmail for sender mail TO fallback #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3517757
[TASK] respect sender.default.senderEmail for sender mail TO fallback
jpmschuler Mar 14, 2022
3a4b082
[REGRESSION] getSenderMailFromDefault wrong arguments
jpmschuler Mar 14, 2022
911286d
[REGRESSION] argument cleanup
jpmschuler Mar 14, 2022
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
21 changes: 13 additions & 8 deletions Classes/Domain/Repository/MailRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,10 @@ public function getVariablesWithMarkersFromMail(Mail $mail, bool $htmlSpecialCha
* Returns senderemail from a couple of arguments
*
* @param Mail $mail
* @param string $default
* @param string|array $default String as default or cObject array
* @return string Sender Email
*/
public function getSenderMailFromArguments(Mail $mail, string $default = ''): string
public function getSenderMailFromArguments(Mail $mail, $default = null): string
{
$email = '';
foreach ($mail->getAnswers() as $answer) {
Expand All @@ -376,8 +376,17 @@ public function getSenderMailFromArguments(Mail $mail, string $default = ''): st
break;
}
}
if (empty($email) && $default) {
if (!is_array($default)) {
$email = $default;
} else {
/** @var ContentObjectRenderer $contentObject */
$contentObject = ObjectUtility::getObjectManager()->get(ContentObjectRenderer::class);
$email = $contentObject->cObjGetSingle($default[0][$default[1]], $default[0][$default[1] . '.']);
}
}
if (empty($email)) {
$email = $this->getSenderMailFromDefault($default);
$email = $this->getSenderMailFromSystemDefaults();
}
return $email;
}
Expand Down Expand Up @@ -492,19 +501,15 @@ public function initializeObject(): void
/**
* Get sender default email address
*
* @param string $default
* @return string
*/
protected function getSenderMailFromDefault(string $default): string
protected function getSenderMailFromSystemDefaults(): string
{
$email = LocalizationUtility::translate('error_no_sender_email') . '@';
$email .= str_replace('www.', '', GeneralUtility::getIndpEnv('TYPO3_HOST_ONLY'));
if (GeneralUtility::validEmail(ConfigurationUtility::getDefaultMailFromAddress())) {
$email = ConfigurationUtility::getDefaultMailFromAddress();
}
if (!empty($default)) {
$email = $default;
}
return $email;
}

Expand Down
5 changes: 4 additions & 1 deletion Classes/Domain/Service/Mail/SendSenderMailPreflight.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ public function sendSenderMail(Mail $mail): void
$senderService = ObjectUtility::getObjectManager()->get(SenderMailPropertiesService::class, $this->settings);
$email = [
'template' => 'Mail/SenderMail',
'receiverEmail' => $this->mailRepository->getSenderMailFromArguments($mail),
'receiverEmail' => $this->mailRepository->getSenderMailFromArguments(
$mail,
[$this->conf['sender.']['default.'], 'senderEmail']
),
'receiverName' => $this->mailRepository->getSenderNameFromArguments(
$mail,
[$this->conf['sender.']['default.'], 'senderName']
Expand Down