X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=7df4d8f710d4d926766c406e03c405a52eade6e3;hb=ef8bdde1d3b805a341e64cb29c89e562e1ca963f;hp=663654809ffd6ab7907d1d4ec1234700fd658bca;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 663654809f..7df4d8f710 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -194,10 +194,25 @@ function isDirectory ($FQFN) {
 	return $GLOBALS[__FUNCTION__][$FQFN];
 }
 
+// "Getter" for the real remote IP number
+function detectRealIpAddress () {
+	// Get remote ip from environment
+	$remoteAddr = determineRealRemoteAddress();
+
+	// Is removeip installed?
+	if (isExtensionActive('removeip')) {
+		// Then anonymize it
+		$remoteAddr = getAnonymousRemoteAddress($remoteAddr);
+	} // END - if
+
+	// Return it
+	return $remoteAddr;
+}
+
 // "Getter" for remote IP number
 function detectRemoteAddr () {
 	// Get remote ip from environment
-	$remoteAddr = determineRealRemoteAddress();
+	$remoteAddr = determineRealRemoteAddress(true);
 
 	// Is removeip installed?
 	if (isExtensionActive('removeip')) {
@@ -271,6 +286,28 @@ function detectServerName () {
 	return (getenv('SERVER_NAME'));
 }
 
+// Removes any  existing www. from SERVER_NAME. This is very silly but enough
+// for our purpose here.
+function detectDomainName () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Get server name
+		$domainName = detectServerName();
+
+		// Is there any www. ?
+		if (substr($domainName, 0, 4) == 'www.') {
+			// Remove it
+			$domainName = substr($domainName, 4);
+		} // END - if
+
+		// Set cache
+		$GLOBALS[__FUNCTION__] = $domainName;
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Check wether we are installing
 function isInstalling () {
 	// Determine wether we are installing
@@ -623,17 +660,23 @@ function isModuleSet ($strict =  false) {
 
 // Getter for 'output_mode' value
 function getScriptOutputMode () {
-	// Default is null
-	$output_mode = null;
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Default is null
+		$output_mode = null;
 
-	// Is the value set?
-	if (isOutputModeSet(true)) {
-		// Then use it
-		$output_mode = $GLOBALS['output_mode'];
+		// Is the value set?
+		if (isOutputModeSet(true)) {
+			// Then use it
+			$output_mode = $GLOBALS['output_mode'];
+		} // END - if
+
+		// Store it in cache
+		$GLOBALS[__FUNCTION__] = $output_mode;
 	} // END - if
 
-	// Return it
-	return $output_mode;
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
 }
 
 // Setter for 'output_mode' value
@@ -649,7 +692,7 @@ function isOutputModeSet ($strict =  false) {
 	// Should we abort here?
 	if (($strict === true) && ($isset === false)) {
 		// Output backtrace
-		debug_report_bug(__FUNCTION__, __LINE__, 'Output_mode is empty.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Output mode is not set.');
 	} // END - if
 
 	// Return it