Continued:

[core.git] / framework / main / classes / helper / captcha / web / class_GraphicalCodeCaptcha.php

diff --git a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
index 45eaf4a8f94b89aa8d715f7b6a6099732b264218..ade0e84ce94a8b44539f9d18e3752f920a99869c 100644 (file)
--- a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -3,8 +3,10 @@
 namespace Org\Mxchange\CoreFramework\Helper\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\Generic\FrameworkInterface;
+use Org\Mxchange\CoreFramework\Helper\Crypto\CryptoHelper;
 use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
 
 /**
@@ -12,7 +14,7 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @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 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -45,7 +47,7 @@ class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -78,10 +80,10 @@ class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
         */
        public function initiateCaptcha () {
                // Get total length
-               $captchaLength = $this->getConfigInstance()->getConfigEntry('captcha_string_length');
+               $captchaLength = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('captcha_string_length');
 
                // Get max string length
-               $strLength = $this->getConfigInstance()->getConfigEntry('random_string_length');
+               $strLength = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('random_string_length');
 
                // Calculate starting position based on random place
                $start = $this->getRngInstance()->randomNumber(0, ($strLength - $captchaLength));
@@ -99,7 +101,7 @@ class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
                $captchaString = substr($base64String, $start, $captchaLength);
 
                // Get all characters we want to replace
-               $searchChars = $this->getConfigInstance()->getConfigEntry('captcha_search_chars');
+               $searchChars = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('captcha_search_chars');
 
                // Get fixed salt and use it as "replacement characters"
                $replaceChars = $this->getRngInstance()->getExtraSalt();
@@ -117,10 +119,10 @@ class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
 
                        // Replace character
                        $captchaString = str_replace($search, $replace, $captchaString, $captchaLength);
-               } // END - foreach
+               }
 
                // Get crypto instance
-               $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
+               $cryptoInstance = CryptoHelper::getSelfInstance();
 
                // Hash the CAPTCHA code for later comparison
                $this->hashedString = $cryptoInstance->hashString($captchaString);