Naming inconsistencies for userid fixed

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 7908206a7c6e5af7b92335a8f34e52c5faad74a0..6848f87e4f82bebf81ecbb52f3f89f2376592436 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1286,7 +1286,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
        $data .= getConfig('ENCRYPT_SEPERATOR') . determineReferalId();
        $data .= getConfig('ENCRYPT_SEPERATOR') . getLanguage();
        $data .= getConfig('ENCRYPT_SEPERATOR') . getCurrentTheme();
-       $data .= getConfig('ENCRYPT_SEPERATOR') . getUserId();
+       $data .= getConfig('ENCRYPT_SEPERATOR') . getMemberId();
 
        // Calculate number for generating the code
        $a = $code + getConfig('_ADD') - 1;
@@ -3252,33 +3252,38 @@ function shutdown () {
        exit;
 }
 
-// Setter for userid
-function setUserId ($userid) {
-       // We should not set userid to zero
-       if ($userid == 0) debug_report_bug('Userid should not be set zero.');
+// Init member id
+function initMemberId () {
+       $GLOBALS['member_id'] = 0;
+}
+
+// Setter for member id
+function setMemberId ($memberid) {
+       // We should not set member id to zero
+       if ($memberid == 0) debug_report_bug('Userid should not be set zero.');
 
        // Set it secured
-       $GLOBALS['userid'] = bigintval($userid);
+       $GLOBALS['member_id'] = bigintval($memberid);
 }
 
-// Getter for userid or returns zero
-function getUserId () {
-       // Default userid
-       $userid = 0;
+// Getter for member id or returns zero
+function getMemberId () {
+       // Default member id
+       $memberid = 0;
 
-       // Is the userid set?
-       if (isUserIdSet()) {
+       // Is the member id set?
+       if (isMemberIdSet()) {
                // Then use it
-               $userid = $GLOBALS['userid'];
+               $memberid = $GLOBALS['member_id'];
        } // END - if
 
        // Return it
-       return $userid;
+       return $memberid;
 }
 
-// Checks ether the userid is set
-function isUserIdSet () {
-       return (isset($GLOBALS['userid']));
+// Checks ether the member id is set
+function isMemberIdSet () {
+       return (isset($GLOBALS['member_id']));
 }
 
 // Handle message codes from URL