X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Frng%2Fclass_RandomNumberGenerator.php;h=857478fb61069df8fc1ac2fd0064940820f60a2d;hp=53ef6e76ac66efe223a8a2b7ae5502248f20e37f;hb=47a6960661d9daa28ad7d2aedef359a3ec888642;hpb=b9c18d6c24e3be4393bf41005aa4e428a0ea3218

diff --git a/inc/classes/main/rng/class_RandomNumberGenerator.php b/inc/classes/main/rng/class_RandomNumberGenerator.php
index 53ef6e76..857478fb 100644
--- a/inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/inc/classes/main/rng/class_RandomNumberGenerator.php
@@ -98,12 +98,12 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 		mt_srand((double) sqrt(microtime() * 100000000 * $this->extraNumber));
 
 		// Set the server IP to cluster
-		$serverIp = "cluster";
+		$serverIp = 'cluster';
 
 		// Do we have a single server?
 		if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
 			// Then use that IP for extra security
-			$serverIp = getenv('SERVER_ADDR');
+			$serverIp = $this->getConfigInstance()->detectServerAddress();
 		} // END - if
 
 		// Yet-another fixed salt. This is not dependend on server software or date
@@ -174,6 +174,24 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 	public final function getFixedSalt () {
 		return $this->fixedSalt;
 	}
+
+	/**
+	 * Generates a key based on if we have extra (default) or fixed salt enabled
+	 *
+	 * @return	$key	The generated key for encrypion
+	 */
+	public function generateKey () {
+		// Default is extra salt
+		$key = md5($this->getExtraSalt());
+
+		// Get key
+		if ($this->getConfigInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
+			$key = md5($this->getFixedSalt());
+		} // END - if
+
+		// Return it
+		return $key;
+	}
 }
 
 // [EOF]