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

[TASK] Merging save & send preview button, Huge refactorings on handling... 

[TASK] Merging save & send preview button, Huge refactorings on handling parameters to the controller
parent 5c80bd4e
No related branches found
No related tags found
1 merge request!3New version 4 1
Hide whitespace changes
Inline Side-by-side
Classes/Controller/MailController.php
+ 52
− 93
View file @ 7e48985c
...@@ -69,19 +69,13 @@ class MailController extends ActionController { ...@@ -69,19 +69,13 @@ class MailController extends ActionController {
/** /**
* Show template Selection and enable content input + mail preview * Show template Selection and enable content input + mail preview
* *
* @param string $selectedTemplate * @param array $parameters
* @param string $selectedExtension
* @param string $selectedLanguageLeft
* @param string $selectedLanguageRight
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @throws \UnexpectedValueException * @throws \UnexpectedValueException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
*/ */
public function indexAction( public function indexAction(array $parameters = []) {
$selectedTemplate = NULL, $selectedExtension = NULL, $selectedLanguageLeft = NULL,
$selectedLanguageRight = NULL
) {
$siteRootId = BackendService::getSiteRoot((int) GeneralUtility::_GP('id')); $siteRootId = BackendService::getSiteRoot((int) GeneralUtility::_GP('id'));
if (!($this->session instanceof PhpSession)) { if (!($this->session instanceof PhpSession)) {
...@@ -103,16 +97,17 @@ class MailController extends ActionController { ...@@ -103,16 +97,17 @@ class MailController extends ActionController {
// get language selection or read from cache or get default // get language selection or read from cache or get default
$selectedLanguages = BackendService::getSelectedLanguages( $selectedLanguages = BackendService::getSelectedLanguages(
$selectedLanguageLeft, $selectedLanguageRight, $this->session, $languages $parameters['selectedLanguageLeft'], $parameters['selectedLanguageRight'], $this->session, $languages
); );
if ($selectedTemplate === NULL || $selectedTemplate === '') { if ($parameters['selectedTemplate'] === NULL || $parameters['selectedTemplate'] === '') {
$selectedExtension = key($registerArray); $parameters['selectedExtension'] = key($registerArray);
$selectedTemplate = key($registerArray[$selectedExtension]); $parameters['selectedTemplate'] = key($registerArray[$parameters['selectedExtension']]);
} }
$selectedTemplates = BackendService::getSelectedTemplates( $selectedTemplates = BackendService::getSelectedTemplates(
$selectedExtension, $selectedTemplate, $selectedLanguages, $this->session, $siteRootId $parameters['selectedExtension'], $parameters['selectedTemplate'], $selectedLanguages, $this->session,
$siteRootId
); );
if ($selectedTemplates['left'] instanceof Template) { if ($selectedTemplates['left'] instanceof Template) {
...@@ -123,7 +118,7 @@ class MailController extends ActionController { ...@@ -123,7 +118,7 @@ class MailController extends ActionController {
$this->view->assign('bccLeft', $selectedTemplates['left']->getBcc()); $this->view->assign('bccLeft', $selectedTemplates['left']->getBcc());
$this->view->assign('replyToLeft', $selectedTemplates['left']->getReplyTo()); $this->view->assign('replyToLeft', $selectedTemplates['left']->getReplyTo());
} else { } else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath']; $defaultTemplatePath = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['left'] . '.' . 'template.html'; $defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['left'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) { if (file_exists($defaultTemplateFile)) {
$this->view->assign('contentLeft', file_get_contents($defaultTemplateFile)); $this->view->assign('contentLeft', file_get_contents($defaultTemplateFile));
...@@ -138,28 +133,28 @@ class MailController extends ActionController { ...@@ -138,28 +133,28 @@ class MailController extends ActionController {
$this->view->assign('bccRight', $selectedTemplates['right']->getBcc()); $this->view->assign('bccRight', $selectedTemplates['right']->getBcc());
$this->view->assign('replyToRight', $selectedTemplates['right']->getReplyTo()); $this->view->assign('replyToRight', $selectedTemplates['right']->getReplyTo());
} else { } else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath']; $defaultTemplatePath = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['right'] . '.' . 'template.html'; $defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['right'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) { if (file_exists($defaultTemplateFile)) {
$this->view->assign('contentRight', file_get_contents($defaultTemplateFile)); $this->view->assign('contentRight', file_get_contents($defaultTemplateFile));
} }
} }
$subject = $registerArray[$selectedExtension][$selectedTemplate]['subject']; $subject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'];
if (is_array($subject)) { if (is_array($subject)) {
$this->view->assign( $this->view->assign(
'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() : 'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['left']] $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'][$selectedLanguages['left']]
); );
$this->view->assign( $this->view->assign(
'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() : 'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['right']] $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'][$selectedLanguages['right']]
); );
} else { } else {
$translatedSubjects = BackendService::getTranslatedTemplateSubject( $translatedSubjects = BackendService::getTranslatedTemplateSubject(
$subject, $selectedExtension, $selectedLanguages $subject, $parameters['selectedExtension'], $selectedLanguages
); );
$this->view->assign( $this->view->assign(
...@@ -173,12 +168,12 @@ class MailController extends ActionController { ...@@ -173,12 +168,12 @@ class MailController extends ActionController {
); );
} }
$templateDescription = $registerArray[$selectedExtension][$selectedTemplate]['description']; $templateDescription = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['description'];
if (is_array($templateDescription)) { if (is_array($templateDescription)) {
$templateDescription = $templateDescription[$selectedLanguages['left']]; $templateDescription = $templateDescription[$selectedLanguages['left']];
} else { } else {
$templateDescription = LocalizationUtility::translate( $templateDescription = LocalizationUtility::translate(
$templateDescription, $selectedExtension $templateDescription, $parameters['selectedExtension']
); );
} }
...@@ -189,9 +184,11 @@ class MailController extends ActionController { ...@@ -189,9 +184,11 @@ class MailController extends ActionController {
if ($pageInfo && $pageInfo['is_siteroot'] === '1') { if ($pageInfo && $pageInfo['is_siteroot'] === '1') {
$this->view->assign('templateDescription', $templateDescription); $this->view->assign('templateDescription', $templateDescription);
$this->view->assign('selectedTemplate', $registerArray[$selectedExtension][$selectedTemplate]); $this->view->assign(
$this->view->assign('selectedTemplateKey', $selectedTemplate); 'selectedTemplate', $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]
$this->view->assign('selectedExtensionKey', $selectedExtension); );
$this->view->assign('selectedTemplateKey', $parameters['selectedTemplate']);
$this->view->assign('selectedExtensionKey', $parameters['selectedExtension']);
$this->view->assign('selectedLanguageLeft', $selectedLanguages['left']); $this->view->assign('selectedLanguageLeft', $selectedLanguages['left']);
$this->view->assign('selectedLanguageRight', $selectedLanguages['right']); $this->view->assign('selectedLanguageRight', $selectedLanguages['right']);
$this->view->assign('mode', 'editor'); $this->view->assign('mode', 'editor');
...@@ -205,58 +202,7 @@ class MailController extends ActionController { ...@@ -205,58 +202,7 @@ class MailController extends ActionController {
$this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent()); $this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
$this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version)); $this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
$this->view->assign('beUserMail', $GLOBALS['BE_USER']->user['email']); $this->view->assign('beUserMail', $GLOBALS['BE_USER']->user['email']);
}
/**
* Save content (left & right)
* if left & right is the same language, the right content will apply only if its another language
*
* @param string $contentLeft
* @param string $contentRight
* @param string $selectedExtension
* @param string $selectedTemplate
* @param string $selectedLanguageLeft
* @param string $selectedLanguageRight
* @param string $subjectLeft
* @param string $subjectRight
* @param string $fromNameLeft
* @param string $fromMailLeft
* @param string $ccLeft
* @param string $bccLeft
* @param string $replyToLeft
* @param string $fromNameRight
* @param string $fromMailRight
* @param string $ccRight
* @param string $bccRight
* @param string $replyToRight
* @throws \InvalidArgumentException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
*/
public function saveAction(
$contentLeft = NULL, $contentRight = NULL, $selectedExtension = NULL, $selectedTemplate = NULL,
$selectedLanguageLeft = NULL, $selectedLanguageRight = NULL, $subjectLeft = NULL, $subjectRight = NULL,
$fromNameLeft = NULL, $fromMailLeft = NULL, $ccLeft = NULL, $bccLeft = NULL, $replyToLeft = NULL,
$fromNameRight = NULL, $fromMailRight = NULL, $ccRight = NULL, $bccRight = NULL, $replyToRight = NULL
) {
$this->saveTemplate(
$selectedExtension, $selectedTemplate, $selectedLanguageLeft, $contentLeft, $subjectLeft,
$fromNameLeft, $fromMailLeft, $ccLeft, $bccLeft, $replyToLeft
);
if ($selectedLanguageLeft !== $selectedLanguageRight) {
$this->saveTemplate(
$selectedExtension, $selectedTemplate, $selectedLanguageRight, $contentRight, $subjectRight,
$fromNameRight, $fromMailRight, $ccRight, $bccRight, $replyToRight
);
}
$message = LocalizationUtility::translate('backend.success', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::OK);
$arguments = $this->request->getArguments();
$this->redirect('index', NULL, NULL, $arguments);
} }
/** /**
...@@ -320,37 +266,32 @@ class MailController extends ActionController { ...@@ -320,37 +266,32 @@ class MailController extends ActionController {
* send a test email to a given address * send a test email to a given address
* redirect to index action * redirect to index action
* *
* @param string $emailAddress * @param array $parameters
* @param string $selectedTemplateKey
* @param string $selectedExtensionKey
* @param string $selectedLanguageLeft
* @param string $selectedLanguageRight
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
*/ */
public function sendTestMailAction( public function sendTestMailAction(array $parameters = []) {
$emailAddress, $selectedExtensionKey, $selectedTemplateKey, $selectedLanguageLeft, $selectedLanguageRight
) {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class); $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */ /** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class); $mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailTemplateService->setLanguage($selectedLanguageLeft); $mailTemplateService->setLanguage($parameters['selectedLanguageLeft']);
$mailTemplateService->setToAddresses($emailAddress); $mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setFromAddress('noreply@example.org');
$mailTemplateService->setTemplateName($selectedTemplateKey); $mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($selectedExtensionKey); $mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE); $mailIsSend = $mailTemplateService->sendEmail(TRUE);
if ($selectedLanguageRight !== $selectedLanguageLeft) { if ($parameters['selectedLanguageRight'] !== $parameters['selectedLanguageLeft']) {
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */ /** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class); $mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailTemplateService->setLanguage($selectedLanguageRight); $mailTemplateService->setLanguage($parameters['selectedLanguageRight']);
$mailTemplateService->setToAddresses($emailAddress); $mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setFromAddress('noreply@example.org');
$mailTemplateService->setTemplateName($selectedTemplateKey); $mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($selectedExtensionKey); $mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE); $mailIsSend = $mailTemplateService->sendEmail(TRUE);
} }
...@@ -362,6 +303,24 @@ class MailController extends ActionController { ...@@ -362,6 +303,24 @@ class MailController extends ActionController {
$this->addFlashMessage($message, '', FlashMessage::ERROR); $this->addFlashMessage($message, '', FlashMessage::ERROR);
} }
$this->saveTemplate(
$parameters['selectedExtension'], $parameters['selectedTemplate'], $parameters['selectedLanguageLeft'],
$parameters['contentLeft'], $parameters['subjectLeft'],
$parameters['fromNameLeft'], $parameters['fromMailLeft'], $parameters['ccLeft'], $parameters['bccLeft'],
$parameters['replyToLeft']
);
if ($parameters['selectedLanguageleft'] !== $parameters['selectedLanguageRight']) {
$this->saveTemplate(
$parameters['selectedExtension'], $parameters['selectedTemplate'], $parameters['selectedLanguageRight'],
$parameters['contentRight'], $parameters['subjectRight'],
$parameters['fromNameRight'], $parameters['fromMailRight'], $parameters['ccRight'],
$parameters['bccRight'], $parameters['replyToRight']
);
}
$message = LocalizationUtility::translate('backend.success', 'sg_mail');
$this->addFlashMessage($message, '', FlashMessage::OK);
$arguments = $this->request->getArguments(); $arguments = $this->request->getArguments();
$this->redirect('index', NULL, NULL, $arguments); $this->redirect('index', NULL, NULL, $arguments);
} }
......
Resources/Private/Language/de.locallang.xlf
+ 2
− 2
View file @ 7e48985c
...@@ -190,8 +190,8 @@ ...@@ -190,8 +190,8 @@
<target>Diese E-Mail jetzt versenden?</target> <target>Diese E-Mail jetzt versenden?</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.send_test" approved="yes"> <trans-unit id="backend.send_test" approved="yes">
<source>Send Preview Mail (Save First!)</source> <source>Save and send preview</source>
<target>Sende Vorschau-Mail (Bitte vorher speichern!)</target> <target>Speichern und Vorschau-Mail senden</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.sending_time" approved="yes"> <trans-unit id="backend.sending_time" approved="yes">
<source>Sending Time</source> <source>Sending Time</source>
......
Resources/Private/Language/locallang.xlf
+ 1
− 1
View file @ 7e48985c
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<source>Send this email now?</source> <source>Send this email now?</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.send_test"> <trans-unit id="backend.send_test">
<source>Send Preview Mail (Save First!)</source> <source>Save and send preview</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.sending_time"> <trans-unit id="backend.sending_time">
<source>Sending Time</source> <source>Sending Time</source>
......
Resources/Private/Layouts/Default.html
+ 4
− 4
View file @ 7e48985c
...@@ -71,14 +71,14 @@ ...@@ -71,14 +71,14 @@
<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}" <sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
controller="Queue" controller="Queue"
action="index" action="index"
arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" arguments="{parameters: {selectedTemplate: templateKey, selectedExtension: extensionKey}}"
additionalAttributes="{selected: 'selected'}" /> additionalAttributes="{selected: 'selected'}" />
</f:then> </f:then>
<f:else> <f:else>
<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}" <sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
controller="Queue" controller="Queue"
action="index" action="index"
arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" /> arguments="{parameters: {selectedTemplate: templateKey, selectedExtension: extensionKey}}" />
</f:else> </f:else>
</sgm:extendedIf> </sgm:extendedIf>
</f:for> </f:for>
...@@ -94,14 +94,14 @@ ...@@ -94,14 +94,14 @@
<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}" <sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
controller="Mail" controller="Mail"
action="index" action="index"
arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" arguments="{parameters: {selectedTemplate: templateKey, selectedExtension: extensionKey}}"
additionalAttributes="{selected: 'selected'}" /> additionalAttributes="{selected: 'selected'}" />
</f:then> </f:then>
<f:else> <f:else>
<sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}" <sgm:be.menus.actionMenuItem label="{currentTemplate.templateName}"
controller="Mail" controller="Mail"
action="index" action="index"
arguments="{selectedTemplate: templateKey, selectedExtension: extensionKey}" /> arguments="{parameters: {selectedTemplate: templateKey, selectedExtension: extensionKey}}" />
</f:else> </f:else>
</sgm:extendedIf> </sgm:extendedIf>
</f:for> </f:for>
......
Resources/Private/Layouts/Queue.html
+ 4
− 4
View file @ 7e48985c
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
controller="Queue" controller="Queue"
action="index" action="index"
additionalAttributes="{selected: 'selected'}" additionalAttributes="{selected: 'selected'}"
arguments="{selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}" /> arguments="{parameters: {selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}}" />
</f:then> </f:then>
<f:else> <f:else>
<sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.mail_queue')}" <sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.mail_queue')}"
controller="Queue" controller="Queue"
action="index" action="index"
arguments="{selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}" /> arguments="{parameters: {selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}}" />
</f:else> </f:else>
</f:if> </f:if>
<f:if condition="{mode} == 'editor'"> <f:if condition="{mode} == 'editor'">
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
<sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.template_editor')}" <sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.template_editor')}"
controller="Mail" controller="Mail"
action="index" action="index"
arguments="{selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}" arguments="{parameters: {selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}}"
additionalAttributes="{selected: 'selected'}" /> additionalAttributes="{selected: 'selected'}" />
</f:then> </f:then>
<f:else> <f:else>
<sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.template_editor')}" <sgm:be.menus.actionMenuItem label="{f:translate(key:'backend.template_editor')}"
controller="Mail" controller="Mail"
action="index" action="index"
arguments="{selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}" /> arguments="{parameters: {selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}}" />
</f:else> </f:else>
</f:if> </f:if>
</f:be.menus.actionMenu> </f:be.menus.actionMenu>
......
Resources/Private/Templates/Mail/Index.html
+ 37
− 46
View file @ 7e48985c
...@@ -69,18 +69,15 @@ ...@@ -69,18 +69,15 @@
</table> </table>
</div> </div>
<f:form class="col-md-12" method="post" controller="Mail" action="sendTestMail"> <f:form class="col-md-12" method="post" controller="Mail" action="sendTestMail">
<f:form.submit class="btn-primary btn form-group" value="{f:translate(key:'backend.send_test')}" />
<f:form.textfield name="emailAddress" type="email" required="TRUE" class="email-input form-group" value="{beUserMail}" />
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}" />
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}" />
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}" />
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}" />
</f:form>
<f:form method="post" controller="Mail" action="save">
<div class="col-md-12 form-group"> <div class="col-md-12 form-group">
<f:form.submit class="btn-save-backend btn-success btn col-md-2 form-group" value="{f:translate(key:'backend.save')}" /> <f:form.submit class="btn-primary btn form-group" value="{f:translate(key:'backend.send_test')}" />
<f:form.textfield name="parameters[emailAddress]" type="email" required="TRUE" class="email-input form-group" value="{beUserMail}" />
<f:form.hidden name="parameters[selectedLanguageLeft]" value="{selectedLanguageLeft}" />
<f:form.hidden name="parameters[selectedLanguageRight]" value="{selectedLanguageRight}" />
<f:form.hidden name="parameters[selectedTemplate]" value="{selectedTemplateKey}" />
<f:form.hidden name="parameters[selectedExtensionKey]" value="{selectedTemplate.extension}" />
<f:form.hidden name="parameters[selectedExtension]" value="{selectedTemplate.extension}" />
<f:form.hidden name="parameters[selectedTemplateKey]" value="{selectedTemplateKey}" />
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
...@@ -109,37 +106,31 @@ ...@@ -109,37 +106,31 @@
<f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, language: selectedLanguageLeft, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action> <f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, language: selectedLanguageLeft, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="fromNameLeft" class="">{f:translate(key:'backend.fromName')}</label> <label for="parameters[fromNameLeft]" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{fromNameLeft}" name="fromNameLeft" /> <f:form.textfield type="text" class="form-control" value="{fromNameLeft}" name="parameters[fromNameLeft]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="fromMailLeft" class="">{f:translate(key:'backend.fromMail')}</label> <label for="parameters[fromMailLeft]" class="">{f:translate(key:'backend.fromMail')}</label>
<f:form.textfield type="email" class="form-control" value="{fromMailLeft}" name="fromMailLeft" /> <f:form.textfield type="email" class="form-control" value="{fromMailLeft}" name="parameters[fromMailLeft]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="ccLeft" class="">{f:translate(key:'backend.cc')}</label> <label for="parameters[ccLeft]" class="">{f:translate(key:'backend.cc')}</label>
<f:form.textfield type="text" class="form-control" value="{ccLeft}" name="ccLeft" /> <f:form.textfield type="text" class="form-control" value="{ccLeft}" name="parameters[ccLeft]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="bccLeft" class="">{f:translate(key:'backend.bcc')}</label> <label for="parameters[bccLeft]" class="">{f:translate(key:'backend.bcc')}</label>
<f:form.textfield type="text" class="form-control" value="{bccLeft}" name="bccLeft" /> <f:form.textfield type="text" class="form-control" value="{bccLeft}" name="parameters[bccLeft]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="replyToLeft" class="">{f:translate(key:'backend.replyTo')}</label> <label for="parameters[replyToLeft]" class="">{f:translate(key:'backend.replyTo')}</label>
<f:form.textfield type="text" class="form-control" value="{replyToLeft}" name="replyToLeft" /> <f:form.textfield type="text" class="form-control" value="{replyToLeft}" name="parameters[replyToLeft]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="subjectLeft" class="">{f:translate(key:'backend.subject')}</label> <label for="parameters[subjectLeft]" class="">{f:translate(key:'backend.subject')}</label>
<f:form.textfield type="text" class="form-control" value="{subjectLeft}" name="subjectLeft" /> <f:form.textfield type="text" class="form-control" value="{subjectLeft}" name="parameters[subjectLeft]" />
</div> </div>
<label for="contentLeft" class="">{f:translate(key:'backend.content')}</label> <label for="parameters[contentLeft]" class="">{f:translate(key:'backend.content')}</label>
<f:form.textarea class="form-control" rows="25" name="contentLeft" value="{contentLeft}" /> <f:form.textarea class="form-control" rows="25" name="parameters[contentLeft]" value="{contentLeft}" />
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}" />
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}" />
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}" />
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}" />
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -169,35 +160,35 @@ ...@@ -169,35 +160,35 @@
<f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, language: selectedLanguageRight, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action> <f:link.action class="reset-btn btn-danger btn form-group" action="reset" arguments="{template: selectedTemplateKey, language: selectedLanguageRight, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset')}</f:link.action>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="fromNameRight" class="">{f:translate(key:'backend.fromName')}</label> <label for="parameters[fromNameRight]" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{fromNameRight}" name="fromNameRight" /> <f:form.textfield type="text" class="form-control" value="{fromNameRight}" name="parameters[fromNameRight]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="fromMailRight" class="">{f:translate(key:'backend.fromMail')}</label> <label for="parameters[fromMailRight]" class="">{f:translate(key:'backend.fromMail')}</label>
<f:form.textfield type="email" class="form-control" value="{fromMailRight}" name="fromMailRight" /> <f:form.textfield type="email" class="form-control" value="{fromMailRight}" name="parameters[fromMailRight]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="ccRight" class="">{f:translate(key:'backend.cc')}</label> <label for="parameters[ccRight]" class="">{f:translate(key:'backend.cc')}</label>
<f:form.textfield type="text" class="form-control" value="{ccRight}" name="ccRight" /> <f:form.textfield type="text" class="form-control" value="{ccRight}" name="parameters[ccRight]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="bccRight" class="">{f:translate(key:'backend.bcc')}</label> <label for="parameters[bccRight]" class="">{f:translate(key:'backend.bcc')}</label>
<f:form.textfield type="text" class="form-control" value="{bccRight}" name="bccRight" /> <f:form.textfield type="text" class="form-control" value="{bccRight}" name="parameters[bccRight]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="replyToRight" class="">{f:translate(key:'backend.replyTo')}</label> <label for="parameters[replyToRight]" class="">{f:translate(key:'backend.replyTo')}</label>
<f:form.textfield type="text" class="form-control" value="{replyToRight}" name="replyToRight" /> <f:form.textfield type="text" class="form-control" value="{replyToRight}" name="parameters[replyToRight]" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="subjectRight" class="">{f:translate(key:'backend.subject')}</label> <label for="parameters[subjectRight]" class="">{f:translate(key:'backend.subject')}</label>
<f:form.textfield type="text" class=" form-control" value="{subjectRight}" name="subjectRight" /> <f:form.textfield type="text" class=" form-control" value="{subjectRight}" name="parameters[subjectRight]" />
</div> </div>
<label for="contentRight" class="">{f:translate(key:'backend.content')}</label> <label for="parameters[contentRight]" class="">{f:translate(key:'backend.content')}</label>
<f:form.textarea class="form-control" rows="25" name="contentRight" value="{contentRight}" /> <f:form.textarea class="form-control" rows="25" name="parameters[contentRight]" value="{contentRight}" />
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<f:form.submit class="btn-save-backend btn-success btn form-control" value="{f:translate(key:'backend.save')}" /> <f:form.submit class="btn-primary btn form-group btn-save-backend " value="{f:translate(key:'backend.send_test')}" />
</div> </div>
</div> </div>
</f:form> </f:form>
......
ext_tables.php
+ 1
− 1
View file @ 7e48985c
...@@ -10,7 +10,7 @@ if (!defined('TYPO3_MODE')) { ...@@ -10,7 +10,7 @@ if (!defined('TYPO3_MODE')) {
'Mail', 'Mail',
'', '',
[ [
'Mail' => 'index, save, sendTestMail, empty, reset', 'Mail' => 'index, sendTestMail, empty, reset',
'Queue' => 'index, sendMail', 'Queue' => 'index, sendMail',
], ],
[ [
......
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