X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=7e2856402937a850599a48ed7f7f3b9287be0fce;hb=e1235e719b767d6693976c3d24489beaa38a3667;hp=c7e4978ce06d380518dae021891ee4699ff816be;hpb=baaf454ac1302f28e3f5b1844a9b512a10883d86;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c7e4978ce0..7e28564029 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/04/2009 *
- * ===============                              Last change: 04/04/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 04/04/2009 *
+ * ===================                          Last change: 04/04/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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;
@@ -237,12 +222,12 @@ function detectRemoteHostname () {
 }
 
 // "Getter" for user agent
-function detectUserAgent () {
+function detectUserAgent ($alwaysReal = false) {
 	// Get remote ip from environment
 	$userAgent = getenv('HTTP_USER_AGENT');
 
 	// Is removeip installed?
-	if (isExtensionActive('removeip')) {
+	if ((isExtensionActive('removeip')) && ($alwaysReal === false)) {
 		// Then anonymize it
 		$userAgent = getAnonymousUserAgent($userAgent);
 	} // END - if
@@ -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
@@ -448,7 +440,7 @@ function isNicknameUsed ($userid) {
 		$isUsed = $GLOBALS['is_nickname_used'][$userid];
 	} else {
 		// Determine it
-		$isUsed = ((isExtensionActive('nickname')) && (('' . round($userid) . '') != $userid));
+		$isUsed = (('' . round($userid) . '') != $userid);
 
 		// And write it to the cache
 		$GLOBALS['is_nickname_used'][$userid] = $isUsed;
@@ -566,14 +558,11 @@ function isModuleSet ($strict =  false) {
 	// Should we abort here?
 	if (($strict === true) && ($isset === false)) {
 		// Output backtrace
-		print 'Module not set!<pre>';
-		debug_print_backtrace();
-		die('</pre');
 		debug_report_bug('module is empty.');
 	} // END - if
 
 	// Return it
-	return $isset;
+	return (($isset === true) && ($GLOBALS['module'] != 'unknown')) ;
 }
 
 // Getter for 'output_mode' value
@@ -738,8 +727,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() < 1) 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));
@@ -753,7 +742,7 @@ function setCurrentUserId ($userid) {
 // Getter for current userid
 function getCurrentUserId () {
 	// Userid must be set before it can be used
-	if (!isset($GLOBALS['current_userid'])) {
+	if (!isCurrentUserIdSet()) {
 		// Not set
 		debug_report_bug('User id is not set.');
 	} // END - if
@@ -762,5 +751,15 @@ function getCurrentUserId () {
 	return $GLOBALS['current_userid'];
 }
 
+// Checks if current userid is set
+function isCurrentUserIdSet () {
+	return isset($GLOBALS['current_userid']);
+}
+
+// Checks wether we are debugging template cache
+function isDebuggingTemplateCache () {
+	return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y');
+}
+
 // [EOF]
 ?>