tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge dc84a231b9 into 81cba4ed4c

Browse Source
This commit is contained in:
Guy Sartorelli 2024-10-14 03:01:41 +00:00 committed by GitHub
commit 18cc37141d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Control/UserDefinedFormController.php
View File

@ -31,8 +31,9 @@ use SilverStripe\UserForms\Model\UserDefinedForm;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\Model\ArrayData; use SilverStripe\Model\ArrayData;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;
use SilverStripe\View\SSViewer;
use SilverStripe\Model\ModelData; use SilverStripe\Model\ModelData;
use SilverStripe\View\TemplateEngine;
use SilverStripe\View\ViewLayerData;
use Swift_RfcComplianceException; use Swift_RfcComplianceException;
/** /**
@ -421,7 +422,8 @@ JS
// Include any parsed merge field references from the CMS editor - this is already escaped // Include any parsed merge field references from the CMS editor - this is already escaped
// This string substitution works for both HTML and plain text emails. // This string substitution works for both HTML and plain text emails.
// $recipient->getEmailBodyContent() will retrieve the relevant version of the email // $recipient->getEmailBodyContent() will retrieve the relevant version of the email
$emailData['Body'] = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields); $engine = Injector::inst()->create(TemplateEngine::class);
$emailData['Body'] = $engine->renderString($recipient->getEmailBodyContent(), ViewLayerData::create($mergeFields));
// only include visible fields if recipient visibility flag is set // only include visible fields if recipient visibility flag is set
if ((bool) $recipient->HideInvisibleFields) { if ((bool) $recipient->HideInvisibleFields) {
$emailData['Fields'] = $visibleSubmittedFields; $emailData['Fields'] = $visibleSubmittedFields;
@ -487,10 +489,10 @@ JS
if ($submittedFormField && trim($submittedFormField->Value ?? '')) { if ($submittedFormField && trim($submittedFormField->Value ?? '')) {
$email->setSubject($submittedFormField->Value); $email->setSubject($submittedFormField->Value);
} else { } else {
$email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields)); $email->setSubject($engine->renderString($recipient->EmailSubject, ViewLayerData::create($mergeFields)));
} }
} else { } else {
$email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields)); $email->setSubject($engine->renderString($recipient->EmailSubject, ViewLayerData::create($mergeFields)));
} }
$this->extend('updateEmail', $email, $recipient, $emailData); $this->extend('updateEmail', $email, $recipient, $emailData);
@ -660,7 +662,7 @@ EOS;
// Hide the step jump button if the FormStep has is initially hidden. // Hide the step jump button if the FormStep has is initially hidden.
// This is particularly important beacause the next/prev page buttons logic is controlled by // This is particularly important beacause the next/prev page buttons logic is controlled by
// the visibility of the FormStep buttons // the visibility of the FormStep buttons
// The HTML for the FormStep buttons is defined in UserFormProgress.ss // The HTML for the FormStep buttons is defined in the UserFormProgress template
$id = str_replace('#', '', $target ?? ''); $id = str_replace('#', '', $target ?? '');
$result .= <<<EOS $result .= <<<EOS
$('.step-button-wrapper[data-for="{$id}"]').addClass('hide'); $('.step-button-wrapper[data-for="{$id}"]').addClass('hide');

4
code/FormField/UserFormsCheckboxSetField.php
View File

@ -12,10 +12,10 @@ class UserFormsCheckboxSetField extends CheckboxSetField
{ {
/** /**
* If your project uses a custom UserFormsCheckboxSetField.ss, ensure that it includes * If your project uses a custom UserFormsCheckboxSetField template, ensure that it includes
* `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work * `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work
* For further details see * For further details see
* templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField template
* *
* Use on a template with .RAW - single and double quoted strings will be safely escaped * Use on a template with .RAW - single and double quoted strings will be safely escaped
* *

4
code/FormField/UserFormsOptionSetField.php
View File

@ -12,10 +12,10 @@ class UserFormsOptionSetField extends OptionsetField
{ {
/** /**
* If your project uses a custom UserFormsCheckboxSetField.ss, ensure that it includes * If your project uses a custom UserFormsCheckboxSetField template, ensure that it includes
* `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work * `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work
* For further details see * For further details see
* templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField template
* *
* Use on a template with .RAW - single and double quoted strings will be safely escaped * Use on a template with .RAW - single and double quoted strings will be safely escaped
* *

8
code/Model/Recipient/EmailRecipient.php
View File

@ -137,6 +137,12 @@ class EmailRecipient extends DataObject
*/ */
private static $allow_unbound_recipient_fields = false; private static $allow_unbound_recipient_fields = false;
/**
* The regex used to find template files for rendering emails.
* By default this finds ss template files.
*/
private static string $email_template_regex = '/^.*\.ss$/';
public function requireDefaultRecords() public function requireDefaultRecords()
{ {
parent::requireDefaultRecords(); parent::requireDefaultRecords();
@ -562,7 +568,7 @@ class EmailRecipient extends DataObject
$templates = []; $templates = [];
$finder = new FileFinder(); $finder = new FileFinder();
$finder->setOption('name_regex', '/^.*\.ss$/'); $finder->setOption('name_regex', static::config()->get('email_template_regex'));
$parent = $this->getFormParent(); $parent = $this->getFormParent();