Merge branch 'master' into ifs

Author: kitzberger

Classes/Domain/Finishers/EmailFinisher.php

@@ -2,6 +2,7 @@
 declare(strict_types = 1);
 namespace Kitzberger\FormMailtext\Domain\Finishers;
 
+use TYPO3\CMS\Core\Mail\FluidEmail;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
@@ -30,6 +31,19 @@ protected function initializeStandaloneView(FormRuntime $formRuntime, string $fo
         return $standaloneView;
     }
 
+    protected function initializeFluidEmail(FormRuntime $formRuntime): FluidEmail
+    {
+        $fluidEmail = parent::initializeFluidEmail($formRuntime);
+
+        $message = $this->parseOption('message');
+        $formValues = $formRuntime->getFormState()->getFormValues();
+		$message = $this->replaceIfs($message, $formValues);
+
+        $fluidEmail->assign('message', $message);
+
+        return $fluidEmail;
+    }
+
     private function replaceIfs($message, $formValues)
     {
         return preg_replace_callback(
@@ -94,6 +108,6 @@ function($match) use ($formValues) {
                 }
             },
             $message
-        );
-    }
+		);
+	}
 }

Resources/Private/Frontend/Templates/Finishers/Email/Default.html

@@ -0,0 +1,49 @@
+{namespace formvh=TYPO3\CMS\Form\ViewHelpers}
+{namespace formmailtext=Kitzberger\FormMailtext\ViewHelpers}
+<f:layout name="SystemEmail" />
+<f:section name="Title">{title}</f:section>
+<f:section name="Main">
+    <formmailtext:renderMessage message="{message -> f:format.html()}">
+        <table>
+            <formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue">
+                <tr>
+                    <f:if condition="{formValue.isSection}">
+                        <f:then>
+                            <td colspan="2"><b>{formvh:translateElementProperty(element: formValue.element, property: 'label')}</b></td>
+                        </f:then>
+                        <f:else>
+                            <td valign="top" align="left">{formvh:translateElementProperty(element: formValue.element, property: 'label')}</td>
+                            <td valign="top" align="left">
+                                <f:if condition="{formValue.value}">
+                                    <f:then>
+                                        <f:if condition="{formValue.isMultiValue}">
+                                            <f:then>
+                                                <table cellspacing="0" border="0">
+                                                    <f:for each="{formValue.processedValue}" as="value">
+                                                        <tr>
+                                                            <td>{value}</td>
+                                                        </tr>
+                                                    </f:for>
+                                                </table>
+                                            </f:then>
+                                            <f:else>
+                                                <table cellspacing="0" border="0">
+                                                    <tr>
+                                                        <td><f:format.nl2br>{formValue.processedValue}</f:format.nl2br></td>
+                                                    </tr>
+                                                </table>
+                                            </f:else>
+                                        </f:if>
+                                    </f:then>
+                                    <f:else>
+                                        -
+                                    </f:else>
+                                </f:if>
+                            </td>
+                        </f:else>
+                    </f:if>
+                </tr>
+            </formvh:renderAllFormValues>
+        </table>
+    </formmailtext:renderMessage>
+</f:section>

Resources/Private/Frontend/Templates/Finishers/Email/Default.txt

@@ -0,0 +1,20 @@
+{namespace formvh=TYPO3\CMS\Form\ViewHelpers}
+{namespace formmailtext=Kitzberger\FormMailtext\ViewHelpers}
+<f:layout name="SystemEmail" />
+<f:section name="Title">{title}</f:section>
+<f:section name="Main">
+<formmailtext:renderMessage message="{message -> f:format.stripTags()}">
+<formvh:renderAllFormValues renderable="{form.formDefinition}" as="formValue"><f:spaceless>
+    <f:if condition="{formValue.isMultiValue}">
+        <f:then>
+            <f:if condition="{formValue.isSection}"><f:then>*** <formvh:translateElementProperty element="{formValue.element}" property="label" /> ***</f:then><f:else><formvh:translateElementProperty element="{formValue.element}" property="label" />: <f:for each="{formValue.processedValue}" as="singleValue">- {singleValue}
+            </f:for></f:else></f:if>
+        </f:then>
+        <f:else>
+            <f:if condition="{formValue.isSection}"><f:then>*** <formvh:translateElementProperty element="{formValue.element}" property="label" /> ***</f:then><f:else><formvh:translateElementProperty element="{formValue.element}" property="label" />: <f:if condition="{formValue.processedValue}"><f:then>{formValue.processedValue -> f:format.raw()}</f:then><f:else>-</f:else></f:if></f:else></f:if>
+        </f:else>
+    </f:if>
+</f:spaceless>
+</formvh:renderAllFormValues>
+</formmailtext:renderMessage>
+</f:section>