New method detectServerAddress() added which should rewrite your code ito.

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

diff --git a/inc/classes/main/rng/class_RandomNumberGenerator.php b/inc/classes/main/rng/class_RandomNumberGenerator.php
index fd416433a52d49f55495d12fc8456d27ca92306c..857478fb61069df8fc1ac2fd0064940820f60a2d 100644 (file)
--- a/inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/inc/classes/main/rng/class_RandomNumberGenerator.php
@@ -103,7 +103,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // Do we have a single server?
                if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
                        // Then use that IP for extra security
                // Do we have a single server?
                if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
                        // Then use that IP for extra security

-                       $serverIp = $this->getConfigInstance()->getServerAddress();
+                       $serverIp = $this->getConfigInstance()->detectServerAddress();

                } // END - if
 
                // Yet-another fixed salt. This is not dependend on server software or date
                } // 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;
        }
        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]
 }
 
 // [EOF]