Allow body in email action

Author: arnoson

src/Actions/EmailAction.php

@@ -3,7 +3,6 @@
 namespace Uniform\Actions;
 
 use Exception;
-use Uniform\Form;
 use Kirby\Cms\App;
 use Kirby\Toolkit\Str;
 use Kirby\Toolkit\I18n;
@@ -100,12 +99,13 @@ protected function sendEmail(array $params)
     }
 
     /**
-     * Get the email subject and resolve possible template strings
-     *
+     * Resolve template strings
+     * 
+     * @param string $string
+     * 
      * @return string
      */
-    protected function getSubject()
-    {
+    protected function resolveTemplate($string) {
         // the form could contain arrays which are incompatible with the template function
         $templatableItems = array_filter($this->form->data(), function ($item) {
             return is_scalar($item);
@@ -119,14 +119,24 @@ protected function getSubject()
             $fallback = '';
         }
 
-        $subject = Str::template($this->option('subject', I18n::translate('uniform-email-subject')), $templatableItems, $fallback);
+        return  Str::template($string, $templatableItems, $fallback);
+    }
+
+    /**
+     * Get the email subject and resolve possible template strings
+     *
+     * @return string
+     */
+    protected function getSubject()
+    {
+        $subject = $this->resolveTemplate($this->option('subject', I18n::translate('uniform-email-subject')));
 
         // Remove newlines to prevent malicious modifications of the email header.
         return str_replace("\n", '', $subject);
     }
 
     /**
-     * Get the email body
+     * Get the email body and resolve possible template strings
      *
      * @param array $data
      *
@@ -136,6 +146,11 @@ protected function getBody($data)
     {
         unset($data[self::EMAIL_KEY]);
         unset($data[self::RECEIVE_COPY_KEY]);
+
+        if (isset($data['body'])) {
+            return $this->resolveTemplate($data['body']);
+        }
+
         $body = '';
         foreach ($data as $key => $value) {
             if (is_array($value)) {

tests/Actions/EmailActionTest.php

@@ -127,6 +127,20 @@ public function testBody()
         $this->assertEquals($expect, $action->email->body()->text());
     }
 
+    public function testBodyTemplate()
+    {
+        $this->form->data('email', '[email protected]');
+        $this->form->data('name', 'Joe');
+        $this->form->data('data', ['somedata']);
+        $action = new EmailActionStub($this->form, [
+            'to' => '[email protected]',
+            'from' => '[email protected]',
+            'body' => "Hello\n{{name}} with {{data}}"
+        ]);
+        $action->perform();
+        $this->assertEquals("Hello\nJoe with ", $action->email->body()->text());
+    }
+
     public function testBodyEscapeHtml()
     {
         $this->form->data('email', '[email protected]');