User id must be set now before we can use it

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 882cd3aa9bd755a3a0554e4c3fc5dce28570aeb8..c7e4978ce06d380518dae021891ee4699ff816be 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
@@ -488,12 +488,12 @@ function setWhatFromConfig ($configEntry) {
 }
 
 // Checks wether what is set and optionally aborts on miss
-function isWhatSet ($abortOnMiss =  false) {
+function isWhatSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['what']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('what is empty.');
        } // END - if
@@ -523,12 +523,12 @@ function setAction ($newAction) {
 }
 
 // Checks wether action is set and optionally aborts on miss
-function isActionSet ($abortOnMiss =  false) {
+function isActionSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['action']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('action is empty.');
        } // END - if
@@ -538,12 +538,12 @@ function isActionSet ($abortOnMiss =  false) {
 }
 
 // Getter for 'module' value
-function getModule () {
+function getModule ($strict = true) {
        // Default is null
        $module = null;
 
        // Is the value set?
-       if (isModuleSet(true)) {
+       if (isModuleSet($strict)) {
                // Then use it
                $module = $GLOBALS['module'];
        } // END - if
@@ -559,14 +559,14 @@ function setModule ($newModule) {
 }
 
 // Checks wether module is set and optionally aborts on miss
-function isModuleSet ($abortOnMiss =  false) {
+function isModuleSet ($strict =  false) {
        // Check for it
        $isset = (!empty($GLOBALS['module']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               print '<pre>';
+               print 'Module not set!<pre>';
                debug_print_backtrace();
                die('</pre');
                debug_report_bug('module is empty.');
@@ -593,16 +593,16 @@ 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
-function isOutputModeSet ($abortOnMiss =  false) {
+function isOutputModeSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['output_mode']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('output_mode is empty.');
        } // END - if
@@ -646,12 +646,14 @@ function redirectToIndexMemberOnlyModule () {
 // Wrapper function for checking if extension is installed and newer or same version
 function isExtensionInstalledAndNewer ($ext_name, $version) {
        // Return it
+       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.'<br />';
        return ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version));
 }
 
 // Wrapper function for checking if extension is installed and older than given version
 function isExtensionInstalledAndOlder ($ext_name, $version) {
        // Return it
+       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.'<br />';
        return ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version)));
 }
 
@@ -706,5 +708,59 @@ 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
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+
+       // 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 (!isset($GLOBALS['current_userid'])) {
+               // Not set
+               debug_report_bug('User id is not set.');
+       } // END - if
+
+       // Return the userid
+       return $GLOBALS['current_userid'];
+}
+
 // [EOF]
 ?>