Get rid of PHP_SELF (still some are left).

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/functions.php b/inc/functions.php
index 4bd467f9d8812b9ae857888832a45eee30653c4a..4469fb25e0f9f2a27e22a4d5cf7d9f3d4fc96909 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -545,7 +545,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
 //
 function generateRandomCode ($length, $code, $userid, $extraData = '') {
        // Build server string
-       $server = $_SERVER['PHP_SELF'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
+       $server = $_SERVER['REQUEST_URI'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
 
        // Build key string
        $keys = getSiteKey() . getEncryptSeparator() . getDateKey();
@@ -781,7 +781,7 @@ function generateHash ($plainText, $salt = '', $hash = TRUE) {
        // When the salt is empty build a new one, else use the first x configured characters as the salt
        if (empty($salt)) {
                // Build server string for more entropy
-               $server = $_SERVER['PHP_SELF'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
+               $server = $_SERVER['REQUEST_URI'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
 
                // Build key string
                $keys = getSiteKey() . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . getFileHash() . getEncryptSeparator() . getMasterSalt();

diff --git a/inc/referral-functions.php b/inc/referral-functions.php
index 4a9832a681b4f64bb63e633eaebf679619ad1e3c..5c4ce145541c5e48299150e1f99a3837b9b3dc04 100644 (file)
--- a/inc/referral-functions.php
+++ b/inc/referral-functions.php
@@ -817,7 +817,7 @@ function determineReferralId () {
        if (isValidReferralId()) {
                // Do not determine it, just return it
                return getReferralId();
-       } elseif ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) {
+       } elseif ((!isHtmlOutputMode()) && (getModule() != 'ref')) {
                // Skip this in non-html-mode and outside ref.php
                return FALSE;
        }
@@ -838,7 +838,7 @@ function determineReferralId () {
                // Set refid=ref (the referral link uses such variable)
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('ref') . ')');
                setReferralId(getRequestElement('ref'));
-       } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+       } elseif ((isGetRequestElementSet('user')) && (getModule() == 'click')) {
                // The variable user comes from  click.php
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')');
                setReferralId(bigintval(getRequestElement('user')));