Skip to content
Snippets Groups Projects
Commit 9d2a683f authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Adding save only button

parent 51494625
No related branches found
No related tags found
1 merge request!6Feature 4 3
Hide whitespace changes
Inline Side-by-side
Classes/Controller/MailController.php
+ 29
− 27
View file @ 9d2a683f
......@@ -223,7 +223,7 @@ class MailController extends ActionController {
public function sendTestMailAction(array $parameters = []) {
foreach ((array) $parameters['templates'] as $parameter) {
$ccAddresses = GeneralUtility::trimExplode(',', $parameter['cc']);
if (count($ccAddresses) > 0) {
if (\count($ccAddresses) > 0) {
foreach ($ccAddresses as $ccAddress) {
if (!filter_var($ccAddress, FILTER_VALIDATE_EMAIL) && trim($ccAddress) !== '') {
......@@ -237,7 +237,7 @@ class MailController extends ActionController {
}
$bccAddresses = GeneralUtility::trimExplode(',', $parameter['bcc']);
if (count($bccAddresses) > 0) {
if (\count($bccAddresses) > 0) {
foreach ($bccAddresses as $bccAddress) {
if (!filter_var($bccAddress, FILTER_VALIDATE_EMAIL) && trim($bccAddress) !== '') {
$message = LocalizationUtility::translate('backend.error_bcc', 'sg_mail');
......@@ -260,35 +260,37 @@ class MailController extends ActionController {
$message = LocalizationUtility::translate('backend.success', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::OK);
if (!filter_var($parameters['emailAddress'], FILTER_VALIDATE_EMAIL)) {
$arguments = $this->request->getArguments();
$this->redirect('index', NULL, NULL, $arguments);
}
if (!$this->request->hasArgument('saveOnly')) {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(
MailTemplateService::class, $parameters['selectedTemplate'], $parameters['selectedExtension']
);
$mailIsSend = FALSE;
if (!filter_var($parameters['emailAddress'], FILTER_VALIDATE_EMAIL)) {
$arguments = $this->request->getArguments();
$this->redirect('index', NULL, NULL, $arguments);
}
foreach ((array) $parameters['templates'] as $key => $template) {
$mailTemplateService->setLanguage($key);
$mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress($template['fromMail']);
$mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE);
}
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(
MailTemplateService::class, $parameters['selectedTemplate'], $parameters['selectedExtension']
);
$mailIsSend = FALSE;
foreach ((array) $parameters['templates'] as $key => $template) {
$mailTemplateService->setLanguage($key);
$mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress($template['fromMail']);
$mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE);
}
if ($mailIsSend) {
$message = LocalizationUtility::translate('backend.success_mail', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::OK);
} else {
$message = LocalizationUtility::translate('backend.failure_mail', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::ERROR);
if ($mailIsSend) {
$message = LocalizationUtility::translate('backend.success_mail', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::OK);
} else {
$message = LocalizationUtility::translate('backend.failure_mail', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::ERROR);
}
}
$arguments = $this->request->getArguments();
$this->redirect('index', NULL, NULL, $arguments);
}
......
Resources/Private/Language/de.locallang.xlf
+ 8
− 4
View file @ 9d2a683f
......@@ -221,6 +221,10 @@
<source>Save</source>
<target>Speichern</target>
</trans-unit>
<trans-unit id="backend.save_template" approved="yes">
<source>Save</source>
<target>Speichern</target>
</trans-unit>
<trans-unit id="backend.select_language" approved="yes">
<source>Language (reloads the page):</source>
<target>Sprache (lädt die Seite neu):</target>
......@@ -285,10 +289,6 @@
<source>The template was resetted successfully.</source>
<target>Das Template erfolgreich zurückgesetzt.</target>
</trans-unit>
<trans-unit id="backend.to_form" approved="yes">
<source>To (If set, this overwrites the recipient everytime!) </source>
<target>Empfänger (Falls angegeben, wird der Empfänger immer überschrieben!)</target>
</trans-unit>
<trans-unit id="backend.to" approved="yes">
<source>To</source>
<target>Empfänger</target>
......@@ -297,6 +297,10 @@
<source>Receiver</source>
<target>Empfänger</target>
</trans-unit>
<trans-unit id="backend.to_form" approved="yes">
<source>To (If set, this overwrites the recipient everytime!) </source>
<target>Empfänger (Falls angegeben, wird der Empfänger immer überschrieben!)</target>
</trans-unit>
<trans-unit id="backend.type" approved="yes">
<source>Type</source>
<target>Typ</target>
......
Resources/Private/Language/locallang.xlf
+ 6
− 3
View file @ 9d2a683f
......@@ -168,6 +168,9 @@
<trans-unit id="backend.save">
<source>Save</source>
</trans-unit>
<trans-unit id="backend.save_template">
<source>Save</source>
</trans-unit>
<trans-unit id="backend.select_language">
<source>Language (reloads the page):</source>
</trans-unit>
......@@ -216,15 +219,15 @@
<trans-unit id="backend.template_reset">
<source>The template was resetted successfully.</source>
</trans-unit>
<trans-unit id="backend.to_form">
<source>To (If set, this overwrites the recipient everytime!) </source>
</trans-unit>
<trans-unit id="backend.to">
<source>To</source>
</trans-unit>
<trans-unit id="backend.toAddress">
<source>Receiver</source>
</trans-unit>
<trans-unit id="backend.to_form">
<source>To (If set, this overwrites the recipient everytime!) </source>
</trans-unit>
<trans-unit id="backend.type">
<source>Type</source>
</trans-unit>
......
Resources/Private/Templates/Mail/Index.html
+ 1
− 0
View file @ 9d2a683f
......@@ -78,6 +78,7 @@
<div class="row col-md-12 form-group">
<f:form method="post" controller="Mail" action="sendTestMail">
<div class="col-md-12 form-group">
<f:form.submit name="saveOnly" class="btn-success btn form-group" value="{f:translate(key:'backend.save_template')}" />
<f:form.submit class="btn-primary btn form-group" value="{f:translate(key:'backend.send_test')}" />
<f:form.textfield name="parameters[emailAddress]" class="email-input form-group" value="{beUserMail}" />
<f:form.hidden name="parameters[selectedTemplate]" value="{selectedTemplateKey}" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment