X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=e9bd29b25ece037df65e7e7963af51f040d72b62;hp=2ad98e13dab1434b5319428a77be691e02c36272;hb=6d6e268d55fb9d9374475e12e2f66dca732ce1eb;hpb=9f6c30cc0e06098171d773d671292081ecee3d29

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 2ad98e13da..e9bd29b25e 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -711,32 +711,35 @@ 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];
 }
 
 // Geter for whole user data array
-function gerUserDataArray () {
+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'];
+	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() == 0) debug_report_bug('User id is zero.');
+	// User id should not be zero so abort here
+	if (getCurrentUserId() < 1) return false;
 
 	// Is the array there and filled?
 	return ((isset($GLOBALS['user_data'][getCurrentUserId()])) && (count($GLOBALS['user_data'][getCurrentUserId()]) > 1));
@@ -749,6 +752,13 @@ function setCurrentUserId ($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'];
 }