X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=d356add7d7f8d942edaad8693aad4c6faa212514;hb=7f104f6fe558bb56b4205241435a2357c2feece1;hp=1c22981c1c5c3fc3b1ce41c0b1e57ba86ea88597;hpb=dfaa8c1675da4071ea451406a6f6fedd4c568416;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 1c22981c1c..d356add7d7 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -709,8 +709,8 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 	// No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
 
 	// Prepare IP number and User Agent
-	$REMOTE_ADDR     = getenv('REMOTE_ADDR');
-	$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
+	$REMOTE_ADDR     = GET_REMOTE_ADDR();
+	$HTTP_USER_AGENT = GET_USER_AGENT();
 
 	// Default admin
 	$ADMIN = MAIN_TITLE;
@@ -881,7 +881,7 @@ function LOAD_URL($URL, $addUrlData=true) {
 	if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
 
 	// Probe for bot from search engine
-	if ((eregi("spider", getenv('HTTP_USER_AGENT'))) || (eregi("bot", getenv('HTTP_USER_AGENT'))) || (eregi("spider", getenv('HTTP_USER_AGENT')))) {
+	if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT())) || (eregi("spider", GET_USER_AGENT()))) {
 		// Search engine bot detected so let's rewrite many chars for the link
 		$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
 
@@ -1167,7 +1167,7 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
 	if (!defined('_MAX')) define('_MAX', 15235);
 
 	// Build server string
-	$server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('REMOTE_ADDR').":".":".filemtime(PATH."inc/databases.php");
+	$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(PATH."inc/databases.php");
 
 	// Build key string
 	$keys   = SITE_KEY.":".DATE_KEY;
@@ -1960,7 +1960,7 @@ function generateHash ($plainText, $salt = "") {
 	// When the salt is empty build a new one, else use the first x configured characters as the salt
 	if (empty($salt)) {
 		// Build server string
-		$server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('REMOTE_ADDR').":".":".filemtime(PATH."inc/databases.php");
+		$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(PATH."inc/databases.php");
 
 		// Build key string
 		$keys   = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])).":".$_CONFIG['master_salt'];
@@ -2535,7 +2535,7 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 }
 // Rebuild cache
 function REBUILD_CACHE ($cache, $inc="") {
-	global $cacheInstance;
+	global $cacheInstance, $_CONFIG, $CSS;
 
 	// Shall I remove the cache file?
 	if ((EXT_IS_ACTIVE("cache")) && (is_object($cacheInstance))) {
@@ -2543,21 +2543,21 @@ function REBUILD_CACHE ($cache, $inc="") {
 		if ($cacheInstance->cache_file($cache, true)) {
 			// Destroy it
 			$cacheInstance->cache_destroy();
+		} // END - if
 
-			// Include file given?
-			if (!empty($inc)) {
-				// Construct FQFN
-				$fqfn = sprintf("%sinc/loader/load_cache-%s.php", PATH, $inc);
-
-				// Is the include there?
-				if (FILE_READABLE($fqfn)) {
-					// And rebuild it from scratch
-					require_once($fqfn);
-				} else {
-					// Include not found!
-					DEBUG_LOG(__FUNCTION__.":Include {$inc} not found. cache={$cache}");
-				}
-			} // END - if
+		// Include file given?
+		if (!empty($inc)) {
+			// Construct FQFN
+			$fqfn = sprintf("%sinc/loader/load_cache-%s.php", PATH, $inc);
+
+			// Is the include there?
+			if (FILE_READABLE($fqfn)) {
+				// And rebuild it from scratch
+				require($fqfn);
+			} else {
+				// Include not found!
+				DEBUG_LOG(__FUNCTION__.":Include {$inc} not found. cache={$cache}");
+			}
 		} // END - if
 	} // END - if
 }
@@ -2598,6 +2598,62 @@ function TRANSLATE_POOL_TYPE ($type) {
 	// Return "translation"
 	return $translated;
 }
+// "Getter" for remote IP number
+function GET_REMOTE_ADDR () {
+	// Get remote ip from environment
+	$remoteAddr = getenv('REMOTE_ADDR');
+
+	// Is removeip installed?
+	if (EXT_IS_ACTIVE("removeip")) {
+		// Then anonymize it
+		$remoteAddr = GET_ANONYMOUS_REMOTE_ADDR($remoteAddr);
+	} // END - if
+
+	// Return it
+	return $remoteAddr;
+}
+// "Getter" for remote hostname
+function GET_REMOTE_HOST () {
+	// Get remote ip from environment
+	$remoteHost = getenv('REMOTE_HOST');
+
+	// Is removeip installed?
+	if (EXT_IS_ACTIVE("removeip")) {
+		// Then anonymize it
+		$remoteHost = GET_ANONYMOUS_REMOTE_HOST($remoteHost);
+	} // END - if
+
+	// Return it
+	return $remoteHost;
+}
+// "Getter" for user agent
+function GET_USER_AGENT () {
+	// Get remote ip from environment
+	$userAgent = getenv('HTTP_USER_AGENT');
+
+	// Is removeip installed?
+	if (EXT_IS_ACTIVE("removeip")) {
+		// Then anonymize it
+		$userAgent = GET_ANONYMOUS_USER_AGENT($userAgent);
+	} // END - if
+
+	// Return it
+	return $userAgent;
+}
+// "Getter" for referer
+function GET_REFERER () {
+	// Get remote ip from environment
+	$referer = getenv('HTTP_REFERER');
+
+	// Is removeip installed?
+	if (EXT_IS_ACTIVE("removeip")) {
+		// Then anonymize it
+		$referer = GET_ANONYMOUS_REFERER($referer);
+	} // END - if
+
+	// Return it
+	return $referer;
+}
 //
 //////////////////////////////////////////////////
 //                                              //