Continued:

[core.git] / framework / main / classes / rng / class_RandomNumberGenerator.php

diff --git a/framework/main/classes/rng/class_RandomNumberGenerator.php b/framework/main/classes/rng/class_RandomNumberGenerator.php
index 25c4c2c99e81f39ebe5818fa7a583ae0c15bd79a..7b83f9d053a864e187a9defee7266666a4f33760 100644 (file)
--- a/framework/main/classes/rng/class_RandomNumberGenerator.php
+++ b/framework/main/classes/rng/class_RandomNumberGenerator.php
@@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @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
  *
@@ -66,9 +66,9 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         * @param       $className      Name of this class
         * @return      void
         */
-       protected function __construct ($className = __CLASS__) {
+       private function __construct () {
                // Call parent constructor
-               parent::__construct($className);
+               parent::__construct(__CLASS__);
        }
 
        /**
@@ -106,7 +106,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         */
        protected function initRng ($extraInstance) {
                // Get the prime number from config
-               $this->prime = $this->getConfigInstance()->getConfigEntry('math_prime');
+               $this->prime = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('math_prime');
 
                // Calculate the extra number which is always the same unless you give
                // a better prime number
@@ -119,10 +119,10 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $serverIp = 'cluster';
 
                // Do we have a single server?
-               if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
+               if (FrameworkBootstrap::getConfigurationInstance()->isEnabled('single_server')) {
                        // Then use that IP for extra security
                        $serverIp = FrameworkBootstrap::detectServerAddress();
-               } // END - if
+               }
 
                // Yet-another fixed salt. This is not dependend on server software or date
                if ($extraInstance instanceof FrameworkInterface) {
@@ -141,12 +141,12 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $this->extraSalt = sha1(
                        $this->fixedSalt . ':' .
                        getenv('SERVER_SOFTWARE') . ':' .
-                       $this->getConfigInstance()->getConfigEntry('date_key') . ':' .
-                       $this->getConfigInstance()->getConfigEntry('base_url')
+                       FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('date_key') . ':' .
+                       FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url')
                );
 
                // Get config entry for max salt length
-               $this->rndStrLen = $this->getConfigInstance()->getConfigEntry('rnd_str_length');
+               $this->rndStrLen = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('rnd_str_length');
        }
 
        /**
@@ -159,7 +159,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // Is the number <1, then fix it to default length
                if ($length < 1) {
                        $length = $this->rndStrLen;
-               } // END - if
+               }
 
                // Initialize the string
                $randomString = '';
@@ -168,7 +168,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                for ($idx = 0; $idx < $length; $idx++) {
                        // Add a random character and add it to our string
                        $randomString .= chr($this->randomNumber(0, 255));
-               } // END - for
+               }
 
                // Return the random string a little mixed up
                return str_shuffle($randomString);
@@ -214,9 +214,9 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $key = md5($this->getExtraSalt());
 
                // Get key
-               if ($this->getConfigInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
+               if (FrameworkBootstrap::getConfigurationInstance()->isEnabled('crypt_fixed_salt')) {
                        $key = md5($this->getFixedSalt());
-               } // END - if
+               }
 
                // Return it
                return $key;