X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=de2d8c0fdb9c613f1c536a6b6047d13474174ccf;hp=bac74d3755979cc9fb9caeaab1164665eda5d234;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hpb=606e585919ff565b55fb3c2cdee4a80c4e61a9c6

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index bac74d3755..de2d8c0fdb 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -222,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
@@ -251,6 +251,12 @@ function detectReferer () {
 	return $referer;
 }
 
+// "Getter" for request URI
+function detectRequestUri () {
+	// Return it
+	return (getenv('REQUEST_URI'));
+}
+
 // Check wether we are installing
 function isInstalling () {
 	// Determine wether we are installing
@@ -440,7 +446,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;
@@ -761,5 +767,20 @@ function isDebuggingTemplateCache () {
 	return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y');
 }
 
+// Wrapper for fetchUserData() and getUserData() calls
+function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
+	// Default is 'guest'
+	$data = getMessage('USERNAME_GUEST');
+
+	// Can we fetch the user data?
+	if (($userId > 0) && (fetchUserData($userId, $keyColumn))) {
+		// Now get the data back
+		$data = getUserData($valueColumn);
+	} // END - if
+
+	// Return it
+	return $data;
+}
+
 // [EOF]
 ?>