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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 763a41d1f7..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
@@ -711,7 +703,7 @@ function setAdminHash ($admin, $hash) {
 // Init user data array
 function initUserData () {
 	// User id should not be zero
-	if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': User id is zero.');
+	if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
 	// Init the user
 	$GLOBALS['user_data'][getCurrentUserId()] = array();
@@ -720,7 +712,7 @@ function initUserData () {
 // Getter for user data
 function getUserData ($column) {
 	// User id should not be zero
-	if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': 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 +721,7 @@ function getUserData ($column) {
 // Geter for whole user data array
 function getUserDataArray () {
 	// User id should not be zero
-	if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': 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 +730,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(__FUNCTION__.': 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 +744,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]
 ?>