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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index cd1eddf236..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
@@ -455,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;
@@ -573,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
@@ -774,5 +756,10 @@ function isCurrentUserIdSet () {
 	return isset($GLOBALS['current_userid']);
 }
 
+// Checks wether we are debugging template cache
+function isDebuggingTemplateCache () {
+	return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y');
+}
+
 // [EOF]
 ?>