Skip to content

Commit db97268

Browse files
committed
fix: move confirmation email validation into short branch
Signed-off-by: Dmitry Tretyakov <dtretyakov@gmail.com>
1 parent 4319280 commit db97268

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

lib/Service/FormsService.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,15 +1003,6 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
10031003
}
10041004
}
10051005

1006-
// confirmationEmailRecipient is only valid for short questions with email validation.
1007-
if (
1008-
$questionType === Constants::ANSWER_TYPE_SHORT
1009-
&& !empty($extraSettings['confirmationEmailRecipient'])
1010-
&& ($extraSettings['validationType'] ?? null) !== 'email'
1011-
) {
1012-
return false;
1013-
}
1014-
10151006
// Validate extraSettings for specific question types
10161007
if ($questionType === Constants::ANSWER_TYPE_DATE) {
10171008
// Ensure dateMin and dateMax don't overlap
@@ -1053,7 +1044,16 @@ public function areExtraSettingsValid(array $extraSettings, string $questionType
10531044
}
10541045

10551046
// Special handling of short input for validation
1056-
} elseif ($questionType === Constants::ANSWER_TYPE_SHORT && isset($extraSettings['validationType'])) {
1047+
} elseif ($questionType === Constants::ANSWER_TYPE_SHORT) {
1048+
if (!empty($extraSettings['confirmationEmailRecipient'])
1049+
&& ($extraSettings['validationType'] ?? null) !== 'email') {
1050+
return false;
1051+
}
1052+
1053+
if (!isset($extraSettings['validationType'])) {
1054+
return true;
1055+
}
1056+
10571057
// Ensure input validation type is known
10581058
if (!in_array($extraSettings['validationType'], Constants::SHORT_INPUT_TYPES)) {
10591059
return false;

0 commit comments

Comments
 (0)