[TASK] review

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';

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'];
 			}
 

Configuration/MailTemplates/Default.html

+{all_fields}