Merge branch 'develop' of https://github.com/Germar/femanager into Germar-develop

Author: sbusemann

Classes/Domain/Validator/ClientsideValidator.php

@@ -203,6 +203,17 @@ public function validateField()
                     }
                     break;
 
+                case stristr($validationSetting, 'captcha('):
+                    $wordRepository = ObjectUtility::getObjectManager()->get(\SJBR\SrFreecap\Domain\Repository\WordRepository::class);
+                    $wordObject = $wordRepository->getWord();
+                    $wordHash = $wordObject->getWordHash();
+                    $userVal = md5(strtolower(utf8_decode($this->getValue())));
+                    if ($wordHash !== $userVal) {
+                        $this->addMessage('validationErrorCaptcha', 'captcha');
+                        $this->isValid = false;
+                    }
+                    break;
+
                 default:
                     // e.g. search for method validateCustom()
                     $mainSetting = StringUtility::getValuesBeforeBrackets($validationSetting);

Classes/ViewHelpers/Misc/CaptchaEnabledViewHelper.php

@@ -26,9 +26,12 @@ public function initializeArguments()
      */
     public function render()
     {
-        $settings = $this->arguments['settings'];
+        // $settings = $this->arguments['settings'];
         $controllerName = strtolower($this->renderingContext->getControllerContext()->getRequest()->getControllerName());
+
+        // return ExtensionManagementUtility::isLoaded('sr_freecap')
+        //     && !empty($settings[$controllerName]['validation']['captcha']['captcha']);
         return ExtensionManagementUtility::isLoaded('sr_freecap')
-            && !empty($settings[$controllerName]['validation']['captcha']['captcha']);
+            && $this->templateVariableContainer->getByPath('settings.' . $controllerName . '.validation.captcha.captcha');
     }
 }

Resources/Private/Language/locallang.xlf

@@ -87,6 +87,9 @@
 			<trans-unit id="tx_femanager_domain_model_user.image">
 				<source>Image</source>
 			</trans-unit>
+            <trans-unit id="tx_femanager_domain_model_user.captcha">
+				<source>Captcha</source>
+			</trans-unit>
 			<trans-unit id="tx_femanager_domain_model_user.terms">
 				<source>I accept the terms and conditions</source>
 			</trans-unit>

Resources/Private/Partials/Fields/CaptchaField.html

@@ -10,7 +10,7 @@
 				id="femanager_field_captcha"
 				name="captcha"
 				class="form-control"
-				additionalAttributes="{data-validation:'required'}"
+				additionalAttributes="{femanager:Validation.FormValidationData(settings:settings,fieldName:'captcha')}"
 				title="{freeCap:translate(key:'notice')} {freeCap:translate(key:'explain')}" />
 		<freeCap:image />
 		<freeCap:audio />