Possible fix #3 for reflink

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 26187489f3450b0c4264429c305456d912a4af33..bc7e7714636bc0c6131ca21d9e8e5bc244fe8fe5 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -711,16 +711,16 @@ function setAdminHash ($admin, $hash) {
 // Init user data array
 function initUserData () {
        // User id should not be zero
-       if (getCurrentUserId() == 0) debug_report_bug('User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Init the user
-       $GLOBALS['user_data'][getCurrentUserId()]['status'] = 'GUEST';
+       $GLOBALS['user_data'][getCurrentUserId()] = array();
 }
 
 // Getter for user data
 function getUserData ($column) {
        // User id should not be zero
-       if (getCurrentUserId() == 0) debug_report_bug('User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Return the value
        return $GLOBALS['user_data'][getCurrentUserId()][$column];
@@ -729,7 +729,7 @@ function getUserData ($column) {
 // Geter for whole user data array
 function getUserDataArray () {
        // User id should not be zero
-       if (getCurrentUserId() == 0) debug_report_bug('User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Get the whole array
        return $GLOBALS['user_data'][getCurrentUserId()];
@@ -738,8 +738,8 @@ function getUserDataArray () {
 // 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() == 0) debug_report_bug('User id is zero.');
+       // 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));
@@ -752,12 +752,20 @@ function setCurrentUserId ($userid) {
 
 // Getter for current userid
 function getCurrentUserId () {
-       // Return zero if not set
-       if (!isset($GLOBALS['current_userid'])) return 0;
+       // 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]
 ?>