Merge branch 'craft-4' of https://github.com/verbb/formie into craft-5

# Conflicts: # CHANGELOG.md # composer.json # src/controllers/FormsController.php # src/models/Phone.php
verbb · May 29, 2024 · 9647d79 · 9647d79
2 parents 6c355ac + 105237c
commit 9647d79
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -488,6 +488,17 @@
 - `Field::name` attribute has been deprecated. Use `Field::label` instead.
 - `Field::inputHtml()` method has been deprecated. Use `Field::cpInputHtml()` instead.
 
+## 2.1.17 - 2024-05-29
+
+### Changed
+- Ensure that sessions exists when calling `formie/forms/refresh-tokens`.
+
+### Fixed
+- Fixed element integrations update matching logic where matched data is empty.
+- Fixed `populateFormValues` values and dynamic Twig.
+- Fixed an error with Phone number fields and `countryCode`.
+- Fixed an error with Phone number fields and `countryName`.
+
 ## 2.1.16 - 2024-05-27
 
 ### Added

diff --git a/src/base/Element.php b/src/base/Element.php
@@ -257,7 +257,12 @@ protected function getElementForPayload(string $elementType, string $identifier,
  $updateElementValues = $this->getFieldMappingValues($submission, $this->updateElementMapping, $updateAttributes);
  $updateElementValues = array_filter($updateElementValues);
 
- // Merge in any extra criteria
+ // Something must be mapped in order to find an element, otherwise it'll just find any element for the criteria
+ if (!$updateElementValues) {
+ return $element;
+ }
+
+ // Merge in any extra criteria supplied by the element integration class
  $updateElementValues = array_merge($updateElementValues, $criteria);
 
  if ($updateElementValues) {

diff --git a/src/controllers/FormsController.php b/src/controllers/FormsController.php
@@ -16,6 +16,7 @@
 use craft\db\Query;
 use craft\helpers\DateTimeHelper;
 use craft\helpers\Json;
+use craft\helpers\Session;
 use craft\helpers\UrlHelper;
 use craft\models\Site;
 use craft\web\Controller;
@@ -309,6 +310,9 @@ public function actionDeleteForm(): ?Response
 
  public function actionRefreshTokens(): Response
  {
+ // Ensure that the session has started, just in case
+ Session::exists();
+
  $params = [
  'csrf' => [
  'param' => $this->request->csrfParam,

diff --git a/src/models/Phone.php b/src/models/Phone.php
@@ -44,11 +44,15 @@ public static function toPhoneString(mixed $value): string
 
  public function __construct($config = [])
  {
- // Normalize the options
+ // Normalize the settings. Included in `toArray` for integrations, but not actively in use. Potentially refactor.
  if (array_key_exists('countryCode', $config)) {
  unset($config['countryCode']);
  }
 
+ if (array_key_exists('countryName', $config)) {
+ unset($config['countryName']);
+ }
+
  parent::__construct($config);
  }
 

diff --git a/src/services/Rendering.php b/src/services/Rendering.php
@@ -408,9 +408,9 @@ public function populateFormValues($element, $values = [], $force = false): void
  try {
  $field = $form->getFieldByHandle($key);
 
- // Ensure that we protect against developers using Twig to populate values from query strings
+ // Prevent users using long-hand Twig `{{` to prevent injection execution. Only an issue for some fields like Hidden fields.
  if (is_string($value)) {
- $value = Formie::$plugin->getTemplates()->renderString($value);
+ $value = str_replace(['{{', '}}', '{%', '%}'], ['{', '}', '', ''], $value);
  }
 
  if ($field) {

diff --git a/src/translations/en/formie.php b/src/translations/en/formie.php
@@ -1,6 +1,16 @@
 <?php
 
 return [
+ //
+ // Email Messages
+ //
+ 'formie_failed_notification_heading' => 'When an email notification fails to send:',
+ 'formie_failed_notification_subject' => 'Email notification failed to send for form "{{ form.title }}" on {{ siteName }}.',
+ 'formie_failed_notification_body' => "An email notification for the form “{{ form.title }}” has failed to send.\n\n" .
+ "The error response was recorded: {{ emailResponse | json_encode }}.\n\n" .
+ "To review it please log into your control panel.\n\n" .
+ "{{ submission.cpEditUrl }}",
+
  '"{label}" should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '"{label}" should contain at most {max, number} {max, plural, one{character} other{characters}}.',
  '(GDPR) {text}' => '(GDPR) {text}',
  '(optional)' => '(optional)',
@@ -1027,9 +1037,6 @@
  'Form Field Mapping' => 'Form Field Mapping',
  'Form Fields' => 'Form Fields',
  'Formie' => 'Formie',
- 'formie_failed_notification_body' => 'formie_failed_notification_body',
- 'formie_failed_notification_heading' => 'formie_failed_notification_heading',
- 'formie_failed_notification_subject' => 'formie_failed_notification_subject',
  'Form imported.' => 'Form imported.',
  'Form Name' => 'Form Name',
  'Forms' => 'Forms',