Classes/Controller/ActionController.php

@@ -27,7 +27,6 @@ use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder;
 use TYPO3\CMS\Extbase\Service\EnvironmentService;
 use TYPO3\CMS\Extbase\Service\ExtensionService;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use Blueways\BwCaptcha\Validation\Validator\CaptchaValidator;
 
 class ActionController extends BaseController
 {
@@ -585,7 +584,7 @@ class ActionController extends BaseController
             if (in_array($argument->getName(), ['step', 'submit', $object])) {
                 continue;
             }
-            if (is_string($argument->getValue()) && method_exists($argument->getValue(), 'getUid')) {
+            if (method_exists($argument->getValue(), 'getUid')) {
                 $pluginArguments[$argument->getName()]
                     = $argument->getValue()->getUid();
             } else {
@@ -836,26 +835,4 @@ class ActionController extends BaseController
                 );
         }
     }
-    /** **/
-    protected function valideCaptcha($captchaId, $value
-    ) {
-        $cacheIdentifier = $GLOBALS['TSFE']->fe_user->getKey('ses', $captchaId);
-
-        if (!$cacheIdentifier) {
-            $this->addValidationError(
-                'captcha',
-                'validator.notvalid'
-            );
-        }
-        // get captcha secret from cache and compare
-        $cache = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('bwcaptcha');
-        $phrase = $cache->get($cacheIdentifier);
-        if ($phrase && $phrase === $value) {
-            return true;
-        }
-        $this->addValidationError(
-            'captcha',
-            'validator.notvalid'
-        );
-    }
 }

Classes/Controller/TranslationController.php

@@ -41,11 +41,7 @@ class TranslationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionCont
             $languageFactory = GeneralUtility::makeInstance(
                 LocalizationFactory::class
             );
-            if (version_compare(TYPO3_branch, '10.0', '>=')) {
+            $language = $this->request->getAttribute('language');
-                $language = $this->request->getAttribute('language');
-            } else {
-                $language = $GLOBALS['TYPO3_REQUEST']->getAttribute('language');
-            }
             $locale = $language->getLocale();
             //\TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump(
             //    $locale, '$locale', 3, true, false

Classes/Utility/ApiUtility.php

@@ -17,7 +17,6 @@ use TYPO3\CMS\Core\Resource\FileReference as CoreFileReference;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference as ExtbaseFileReference;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
-use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
 use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\CMS\Extbase\Service\ImageService;
@@ -77,9 +76,6 @@ class ApiUtility
                 if (substr($method, 0, 3) === 'get') {
                     $methodResult = call_user_func([$row, $method]);
                     $attributeName = lcfirst(substr($method, 3));
-                    if (get_class($methodResult) == LazyLoadingProxy::class) {
-                        $methodResult = $methodResult->_loadRealInstance();
-                    }
                     $propertieResults[$attributeName] = $methodResult;
                 }
             }

Classes/Utility/MailUtility.php

@@ -21,7 +21,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Fluid\View\TemplatePaths;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use Symfony\Component\Mime\Address;
-use TYPO3\CMS\Frontend\Page\PageRepository;
+
 /**
  *
  */
@@ -221,7 +221,7 @@ class MailUtility
         $textView->setTemplate($templateNameText);
         $mail = GeneralUtility::makeInstance(MailMessage::class);
         if (version_compare(TYPO3_branch, '10.0', '>=')) {
-            $mail->from(new Address(key($sender),$sender[key($sender)]));
+            $mail->from(new Address($sender));
             $mail->subject($subject);
         } else {
             $mail->setFrom($sender);
@@ -368,17 +368,7 @@ class MailUtility
         if ($assetDomain) {
             $domain = $assetDomain;
         }
-        $dataProtectionPid = $settings['dataProtectionPid'];
-        $uriBuilder = $objectManager->get(
-            UriBuilder::class
-        );
-        if ($dataProtectionPid) {
-            $pageRepository = GeneralUtility::makeInstance(PageRepository::class);
-            $urlPage = $pageRepository->getPage($settings['dataProtectionPid']);
-            $dataProtectionPid = $domain.$urlPage['slug'];
-        }
         $htmlView->assign('domain', $domain);
-        $htmlView->assign('linkDataprotection', $dataProtectionPid);
         $textBody = $textView->render();
         $htmlBody = $htmlView->render();
         if ($domain) {