From 7237532ebda77dcc4594728c2461530027136037 Mon Sep 17 00:00:00 2001 From: Torsten Oppermann <torsten@sgalinski.de> Date: Wed, 12 Sep 2018 22:18:30 +0200 Subject: [PATCH] [TASK] review --- Classes/Service/MailTemplateService.php | 7 +++---- Classes/XClass/Form/FormEditorController.php | 2 +- Configuration/MailTemplates/Default.html | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 Configuration/MailTemplates/Default.html diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php index fc54a447..224f1794 100644 --- a/Classes/Service/MailTemplateService.php +++ b/Classes/Service/MailTemplateService.php @@ -853,9 +853,8 @@ class MailTemplateService { } $templateDirectory .= '/'; - $templatePath = ExtensionManagementUtility::extPath( - $storeTemplateExtension - ) . self::DEFAULT_TEMPLATE_PATH . $templateDirectory; + $templatePath = ExtensionManagementUtility::extPath($storeTemplateExtension) . self::DEFAULT_TEMPLATE_PATH + . $templateDirectory; if ($configArray['template_path']) { $templatePath = $configArray[$templateKey]; @@ -926,7 +925,7 @@ class MailTemplateService { $allMarker .= $key . ': ' . $value . PHP_EOL; } elseif (\is_array($value)) { foreach ($value as $innerKey => $innerValue) { - $allMarker .= $key . ': ' . $innerValue . PHP_EOL; + $allMarker .= $innerKey . ': ' . $innerValue . PHP_EOL; } } elseif (\is_bool($value)) { $valueAsString = $value ? 'true' : 'false'; diff --git a/Classes/XClass/Form/FormEditorController.php b/Classes/XClass/Form/FormEditorController.php index 7b3818bb..6e9969af 100644 --- a/Classes/XClass/Form/FormEditorController.php +++ b/Classes/XClass/Form/FormEditorController.php @@ -177,7 +177,7 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll foreach ($renderables as $element) { $markerName = $element['identifier']; // if markerName is explicitly set, override the registered identifier - if(isset($element['properties']['markerName']) && $element['properties']['markerName'] !== '') { + if (isset($element['properties']['markerName']) && $element['properties']['markerName'] !== '') { $markerName = $element['properties']['markerName']; } diff --git a/Configuration/MailTemplates/Default.html b/Configuration/MailTemplates/Default.html new file mode 100644 index 00000000..f8663358 --- /dev/null +++ b/Configuration/MailTemplates/Default.html @@ -0,0 +1 @@ +{all_fields} -- GitLab