Possible fix #3 for reflink

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index f8b068dc3523cd20ea144b4de3b66d1935c90445..bc7e7714636bc0c6131ca21d9e8e5bc244fe8fe5 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -443,15 +443,15 @@ function isNicknameUsed ($userid) {
        $isUsed = false;
 
        // Is the cache there
-       if (isset($GLOBALS['cache_probe_nicknames'][$userid])) {
+       if (isset($GLOBALS['is_nickname_used'][$userid])) {
                // Then use it
-               $isUsed = $GLOBALS['cache_probe_nicknames'][$userid];
+               $isUsed = $GLOBALS['is_nickname_used'][$userid];
        } else {
                // Determine it
                $isUsed = ((isExtensionActive('nickname')) && (('' . round($userid) . '') != $userid));
 
                // And write it to the cache
-               $GLOBALS['cache_probe_nicknames'][$userid] = $isUsed;
+               $GLOBALS['is_nickname_used'][$userid] = $isUsed;
        }
 
        // Return the result
@@ -593,7 +593,7 @@ function getOutputMode () {
 
 // Setter for 'output_mode' value
 function setOutputMode ($newOutputMode) {
-       $GLOBALS['output_mode'] = SQL_ESCAPE($newOutputMode);
+       $GLOBALS['output_mode'] = (int) $newOutputMode;
 }
 
 // Checks wether output_mode is set and optionally aborts on miss
@@ -708,5 +708,64 @@ function setAdminHash ($admin, $hash) {
        $GLOBALS['cache_array']['admin']['password'][$admin] = $hash;
 }
 
+// Init user data array
+function initUserData () {
+       // User id should not be zero
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+
+       // Init the user
+       $GLOBALS['user_data'][getCurrentUserId()] = array();
+}
+
+// Getter for user data
+function getUserData ($column) {
+       // User id should not be zero
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+
+       // Return the value
+       return $GLOBALS['user_data'][getCurrentUserId()][$column];
+}
+
+// Geter for whole user data array
+function getUserDataArray () {
+       // User id should not be zero
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+
+       // Get the whole array
+       return $GLOBALS['user_data'][getCurrentUserId()];
+}
+
+// Checks if the user data is valid, this may indicate that the user has logged
+// in, but you should use isMember() if you want to find that out.
+function isUserDataValid () {
+       // User id should not be zero so abort here
+       if (!isCurrentUserIdSet()) return false;
+
+       // Is the array there and filled?
+       return ((isset($GLOBALS['user_data'][getCurrentUserId()])) && (count($GLOBALS['user_data'][getCurrentUserId()]) > 1));
+}
+
+// Setter for current userid
+function setCurrentUserId ($userid) {
+       $GLOBALS['current_userid'] = bigintval($userid);
+}
+
+// Getter for current userid
+function getCurrentUserId () {
+       // Userid must be set before it can be used
+       if (!isCurrentUserIdSet()) {
+               // Not set
+               debug_report_bug('User id is not set.');
+       } // END - if
+
+       // Return the userid
+       return $GLOBALS['current_userid'];
+}
+
+// Checks if current userid is set
+function isCurrentUserIdSet () {
+       return isset($GLOBALS['current_userid']);
+}
+
 // [EOF]
 ?>