Large code cleanups:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index e25da2007ade4fb79c363344f7e5bef9dbb85a31..28c3beea4cd0169c4f77495969fdc85860d4b19b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -658,8 +658,8 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
                $data .= getEncryptSeparator() . getSession('u_hash');
        } // END - if
 
-       // Add referal id, language, theme and userid
-       $data .= getEncryptSeparator() . determineReferalId();
+       // Add referral id, language, theme and userid
+       $data .= getEncryptSeparator() . determineReferralId();
        $data .= getEncryptSeparator() . getLanguage();
        $data .= getEncryptSeparator() . getCurrentTheme();
        $data .= getEncryptSeparator() . getMemberId();
@@ -1605,96 +1605,96 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
        }
 }
 
-// Determines referal id and sets it
-function determineReferalId () {
+// Determines referral id and sets it
+function determineReferralId () {
        // Skip this in non-html-mode and outside ref.php
        if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) {
                return false;
        } // END - if
 
        // Check if refid is set
-       if (isReferalIdValid()) {
+       if (isReferralIdValid()) {
                // This is fine...
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferralId() . ')');
        } elseif (isPostRequestElementSet('refid')) {
-               // Get referal id from POST element refid
+               // Get referral id from POST element refid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestElement('refid') . ')');
-               setReferalId(secureString(postRequestElement('refid')));
+               setReferralId(secureString(postRequestElement('refid')));
        } elseif (isGetRequestElementSet('refid')) {
-               // Get referal id from GET parameter refid
+               // Get referral id from GET parameter refid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestElement('refid') . ')');
-               setReferalId(secureString(getRequestElement('refid')));
+               setReferralId(secureString(getRequestElement('refid')));
        } elseif (isGetRequestElementSet('ref')) {
-               // Set refid=ref (the referal link uses such variable)
+               // Set refid=ref (the referral link uses such variable)
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('refid') . ')');
-               setReferalId(secureString(getRequestElement('ref')));
+               setReferralId(secureString(getRequestElement('ref')));
        } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
                // The variable user comes from  click.php
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')');
-               setReferalId(bigintval(getRequestElement('user')));
+               setReferralId(bigintval(getRequestElement('user')));
        } elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
                // Set session refid as global
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')');
-               setReferalId(bigintval(getSession('refid')));
-       } elseif (isRandomReferalIdEnabled()) {
+               setReferralId(bigintval(getSession('refid')));
+       } elseif (isRandomReferralIdEnabled()) {
                // Select a random user which has confirmed enougth mails
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referal id');
-               setReferalId(determineRandomReferalId());
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referral id');
+               setReferralId(determineRandomReferralId());
        } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid()))) {
                // Set default refid as refid in URL
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
-               setReferalId(getDefRefid());
+               setReferralId(getDefRefid());
        } else {
                // No default id when sql_patches is not installed or none set
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using NULL as refid');
-               setReferalId(NULL);
+               setReferralId(NULL);
        }
 
        // Set cookie when default refid > 0
-       if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferalId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
+       if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferralId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
                // Default is not found
                $found = false;
 
                // Do we have nickname or userid set?
-               if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferalId()))) {
+               if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferralId()))) {
                        // Nickname in URL, so load the id
-                       $found = fetchUserData(getReferalId(), 'nickname');
+                       $found = fetchUserData(getReferralId(), 'nickname');
 
-                       // If we found it, use the userid as referal id
+                       // If we found it, use the userid as referral id
                        if ($found === true) {
                                // Set the userid as 'refid'
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')');
-                               setReferalId(getUserData('userid'));
+                               setReferralId(getUserData('userid'));
                        } // END - if
-               } elseif (isValidUserId(getReferalId())) {
+               } elseif (isValidUserId(getReferralId())) {
                        // Direct userid entered
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferalId() . ')');
-                       $found = fetchUserData(getReferalId());
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferralId() . ')');
+                       $found = fetchUserData(getReferralId());
                }
 
                // Is the record valid?
                if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
-                       // No, then reset referal id
+                       // No, then reset referral id
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
-                       setReferalId(getDefRefid());
+                       setReferralId(getDefRefid());
                } // END - if
 
                // Set cookie
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #1');
-               setSession('refid', getReferalId());
-       } elseif ((!isReferalIdValid()) || (!fetchUserData(getReferalId()))) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #1');
+               setSession('refid', getReferralId());
+       } elseif ((!isReferralIdValid()) || (!fetchUserData(getReferralId()))) {
                // Not valid!
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referal id (' . getReferalId() . '), setting NULL in session');
-               setReferalId(NULL);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referral id (' . getReferralId() . '), setting NULL in session');
+               setReferralId(NULL);
                setSession('refid', NULL);
        } else {
                // Set it from GLOBALS array in session
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #2');
-               setSession('refid', getReferalId());
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #2');
+               setSession('refid', getReferralId());
        }
 
        // Return determined refid
-       return getReferalId();
+       return getReferralId();
 }
 
 // Enables the reset mode and runs it
@@ -2361,18 +2361,18 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) {
        return $pointsColumn;
 }
 
-// Setter for referal id (no bigintval, or nicknames will fail!)
-function setReferalId ($refid) {
+// Setter for referral id (no bigintval, or nicknames will fail!)
+function setReferralId ($refid) {
        $GLOBALS['refid'] = $refid;
 }
 
 // Checks if 'refid' is valid
-function isReferalIdValid () {
-       return ((isset($GLOBALS['refid'])) && (getReferalId() !== NULL) && (getReferalId() > 0));
+function isReferralIdValid () {
+       return ((isset($GLOBALS['refid'])) && (getReferralId() !== NULL) && (getReferralId() > 0));
 }
 
-// Getter for referal id
-function getReferalId () {
+// Getter for referral id
+function getReferralId () {
        return $GLOBALS['refid'];
 }