Continued:

[core.git] / framework / main / classes / filter / verifier / class_GraphicalCodeCaptchaVerifierFilter.php

diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index 3a123427a76ad3dee257457fbb66f5f1192a7371..637dedb9d7f7081f50df6a3b8e8d3ea973bd978d 100644 (file)
--- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -3,8 +3,10 @@
 namespace Org\Mxchange\CoreFramework\Filter\Verifier\Captcha;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -14,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -37,7 +39,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -65,7 +67,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Is the form set?
-               if (($requestInstance->getRequestElement('command') !== 'do_form') ||  (!$requestInstance->isRequestElementSet('form'))) {
+               if (($requestInstance->getRequestElement('command') !== 'do_form') || (!$requestInstance->isRequestElementSet('form'))) {
                        // Required field not set
                        $requestInstance->requestIsValid(false);
 
@@ -74,7 +76,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
                        // Skip further processing
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
 
                // Create config entry
                $configKey = sprintf('%s_captcha_secured',
@@ -82,10 +84,10 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
                );
 
                // Is the CAPTCHA enabled?
-               if ($this->getConfigInstance()->getConfigEntry($configKey) != 'Y') {
+               if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) != 'Y') {
                        // Not enabled, so don't check
                        return;
-               } // END - if
+               }
 
                // Get the captcha code
                $captchaCode = $requestInstance->getRequestElement('c_code');
@@ -151,7 +153,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
                        // Skip further processing
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - not the same!
+               }
        }
 
 }