X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=13a0fce739768900e76644b92ae6df18134708f4;hp=c7711857d65a7010d4f249c7e64b5e3320931989;hb=3bcb292dd0b55177499600c226d5d2aa8a932ce7;hpb=9eb4caf6c374ebfb37b73e4549ef6fba9462dcee

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c7711857d6..13a0fce739 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -137,25 +137,10 @@ function decodeString ($str, $decompress = true) {
 	return $str;
 }
 
-// Smartly adds slashes
-function smartAddSlashes ($unquoted) {
-	// Do we have cache?
-	if (!isset($GLOBALS['smart_addslashes'][$unquoted])) {
-		// Remove slashe
-		$unquoted = str_replace("\\", '', $unquoted);
-
-		// Put it in cache and add slashes
-		$GLOBALS['smart_addslashes'][$unquoted] = addslashes($unquoted);
-	} // END - if
-
-	// Return result
-	return $GLOBALS['smart_addslashes'][$unquoted];
-}
-
 // Decode entities in a nicer way
-function decodeEntities ($str) {
+function decodeEntities ($str, $quote = ENT_NOQUOTES) {
 	// Decode the entities to UTF-8 now
-	$decodedString = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
+	$decodedString = html_entity_decode($str, $quote, 'UTF-8');
 
 	// Return decoded string
 	return $decodedString;
@@ -428,8 +413,15 @@ function removeFile ($FQFN) {
 }
 
 // Wrapper for $_POST['sel']
-function countPostSelection () {
-	return countSelection(postRequestElement('sel'));
+function countPostSelection ($element = 'sel') {
+	// Is it set?
+	if (isPostRequestElementSet($element)) {
+		// Return counted elements
+		return countSelection(postRequestElement($element));
+	} else {
+		// Return zero if not found
+		return 0;
+	}
 }
 
 // Checks wether the config-local.php is loaded
@@ -443,15 +435,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 +480,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 +515,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 +530,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,12 +551,12 @@ 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 'Module not set!<pre>';
 		debug_print_backtrace();
@@ -593,16 +585,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
@@ -708,5 +700,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]
 ?>