Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/FieldValidator/FormValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class FormValidator extends AbstractValidator
{
protected function isValid($value): void
protected function isValid(mixed $value): void
{
$friendlyCaptchaService = GeneralUtility::makeInstance(Api::class);
if (!$friendlyCaptchaService->verify()) {
Expand Down
100 changes: 79 additions & 21 deletions Classes/FieldValidator/PowermailValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@

namespace StudioMitte\FriendlyCaptcha\FieldValidator;

use In2code\Powermail\Domain\Model\Field;
use In2code\Powermail\Domain\Model\Form;
use In2code\Powermail\Domain\Model\Mail;
use In2code\Powermail\Domain\Model\Page;
use In2code\Powermail\Domain\Validator\AbstractValidator;
use StudioMitte\FriendlyCaptcha\Service\Api;
use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;

class PowermailValidator extends AbstractValidator
{
/**
* @param Mail $mail
*/
public function isValid($mail): void
public function isValid(mixed $mail): void
{
if (!$mail instanceof Mail) {
return;
}
if (!$this->isFormWithCaptchaField($mail) || $this->isCaptchaCheckToSkip()) {
return;
}
Expand All @@ -30,11 +35,23 @@ public function isValid($mail): void
}
}

protected function isFormWithCaptchaField($mail): bool
protected function isFormWithCaptchaField(Mail $mail): bool
{
foreach ($mail->getForm()->getPages() as $page) {
$form = $this->resolveLazyLoadingProxy($mail->getForm());
if (!$form instanceof Form) {
return false;
}

$pages = $form->getPages();

foreach ($pages as $page) {
$page = $this->resolveLazyLoadingProxy($page);
if (!$page instanceof Page) {
continue;
}
foreach ($page->getFields() as $field) {
if ($field->getType() === 'friendlycaptcha') {
$field = $this->resolveLazyLoadingProxy($field);
if ($field instanceof Field && $field->getType() === 'friendlycaptcha') {
return true;
}
}
Expand All @@ -49,38 +66,79 @@ protected function isFormWithCaptchaField($mail): bool
*/
protected function isCaptchaCheckToSkip(): bool
{
if (property_exists($this, 'flexForm')) {
$action = $this->getActionName();
$confirmationActive = $this->flexForm['settings']['flexform']['main']['confirmation'] === '1';
$optinActive = $this->flexForm['settings']['flexform']['main']['optin'] === '1';
if ($action === 'create' && $confirmationActive || $action === 'checkCreate' && $confirmationActive) {
return true;
}
$action = $this->getActionName();
$mainFlexFormSettings = $this->getMainFlexFormSettings();
$confirmationActive = ($mainFlexFormSettings['confirmation'] ?? '0') === '1';
$optinActive = ($mainFlexFormSettings['optin'] ?? '0') === '1';
if (($action === 'create' || $action === 'checkCreate') && $confirmationActive) {
return true;
}

if ($action === 'optinConfirm' && $optinActive) {
return true;
}
if ($action === 'optinConfirm' && $optinActive) {
return true;
}

return false;
}

/**
* @return array<string, mixed>
*/
protected function getMainFlexFormSettings(): array
{
/** @var mixed $settings */
$settings = $this->flexForm['settings'] ?? [];
if (!is_array($settings)) {
return [];
}
/** @var mixed $flexForm */
$flexForm = $settings['flexform'] ?? [];
if (!is_array($flexForm)) {
return [];
}
/** @var mixed $main */
$main = $flexForm['main'] ?? [];
if (!is_array($main)) {
return [];
}
/** @var array<string, mixed> $main */
return $main;
}

protected function resolveLazyLoadingProxy(mixed $value): mixed
{
if ($value instanceof LazyLoadingProxy) {
return $value->_loadRealInstance();
}
return $value;
}

/**
* @return string "confirmation" or "create"
*/
protected function getActionName(): string
{
/** @var ServerRequest $request */
$request = $GLOBALS['TYPO3_REQUEST'];
$pluginVariables = $request->getQueryParams()['tx_powermail_pi1'] ?? [];
$request = $GLOBALS['TYPO3_REQUEST'] ?? null;
if (!$request instanceof ServerRequest) {
return '';
}
$queryParams = $request->getQueryParams();
$pluginVariables = $queryParams['tx_powermail_pi1'] ?? [];
if (!is_array($pluginVariables)) {
$pluginVariables = [];
}

$requestBody = $request->getParsedBody();
$postVariables = [];
if (is_array($requestBody) && isset($requestBody['tx_powermail_pi1'])) {
$postVariables = $requestBody['tx_powermail_pi1'];
if (!is_array($postVariables)) {
$postVariables = [];
}
}

ArrayUtility::mergeRecursiveWithOverrule($pluginVariables, $postVariables);
return $pluginVariables['action'];
$action = $pluginVariables['action'] ?? '';
return is_scalar($action) || $action instanceof \Stringable ? (string)$action : '';
}
}