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 c3f09d9400aa7a5239416dff98bdf279b2700cfb..12d481329dc1560a7a79b006dae444bf9c57eba7 100644 (file)
--- a/framework/main/classes/rng/class_RandomNumberGenerator.php
+++ b/framework/main/classes/rng/class_RandomNumberGenerator.php
@@ -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,7 +119,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $serverIp = 'cluster';
 
                // Do we have a single server?
-               if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
+               if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('is_single_server') == 'Y') {
                        // Then use that IP for extra security
                        $serverIp = FrameworkBootstrap::detectServerAddress();
                } // END - if
@@ -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');
        }
 
        /**
@@ -214,7 +214,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $key = md5($this->getExtraSalt());
 
                // Get key
-               if ($this->getConfigInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
+               if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
                        $key = md5($this->getFixedSalt());
                } // END - if