*
* @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 - 2022 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
* @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__);
}
/**
*/
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
$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
+ }
// Yet-another fixed salt. This is not dependend on server software or date
if ($extraInstance instanceof FrameworkInterface) {
$this->fixedSalt = sha1(
$serverIp . ':' .
$extraInstance->__toString() . ':' .
- json_encode($this->getDatabaseInstance()->getConnectionData())
+ json_encode(FrameworkBootstrap::getDatabaseInstance()->getConnectionData())
);
} else {
// Without extra information
- $this->fixedSalt = sha1($serverIp . ':' . json_encode($this->getDatabaseInstance()->getConnectionData()));
+ $this->fixedSalt = sha1($serverIp . ':' . json_encode(FrameworkBootstrap::getDatabaseInstance()->getConnectionData()));
}
// One-way data we need for "extra-salting" the random number
$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');
}
/**
// Is the number <1, then fix it to default length
if ($length < 1) {
$length = $this->rndStrLen;
- } // END - if
+ }
// Initialize the string
$randomString = '';
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);
$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
+ }
// Return it
return $key;