From: Roland Häder <roland@mxchange.org>
Date: Sat, 21 Nov 2009 01:41:46 +0000 (+0000)
Subject: Rewrite of all mail templates with user data to new 'tag-like' functionality
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=62b4ef5bb0b63f7cac5f0dccd816246a108a5d83

Rewrite of all mail templates with user data to new 'tag-like' functionality
---

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index a5b2b3b79c..652a561e2e 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -89,14 +89,14 @@ ORDER BY
 
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variables and constants...
-		$UIDs = '';
+		$useridsContent = '';
 		$content['since'] = (getConfig('ap_inactive_since') / 60 / 60);
 		$content['time']  = (getConfig('ap_inactive_time')  / 60 / 60);
 
 		// Mark found accounts as inactive and send an email
 		while ($content = SQL_FETCHARRAY($result_inactive)) {
 			// Remember userids for the admin
-			$UIDs .= $content['userid'].", ";
+			$useridsContent .= $content['userid'].", ";
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -111,10 +111,10 @@ ORDER BY
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+		$useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
 		// Send mail notification to admin
-		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $UIDs, '');
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent, '');
 	} // END - if
 
 	// Free memory
@@ -135,12 +135,12 @@ ORDER BY `userid` ASC",
 
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variable...
-		$UIDs = '';
+		$useridsContent = '';
 
 		// Delete inactive accounts
 		while ($content = SQL_FETCHARRAY($result_inactive)) {
 			// Remember userids for the admin
-			$UIDs .= $content['userid'] . ', ';
+			$useridsContent .= $content['userid'] . ', ';
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -150,11 +150,11 @@ ORDER BY `userid` ASC",
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+		$useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
 		// Send mail notification to admin
 		if (getConfig('ap_in_notify') == 'Y') {
-			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $UIDs, '');
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent, '');
 		} // END - if
 	} // END - if
 
diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 5742c3ed52..31d825d5d0 100644
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -60,13 +60,13 @@ ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_uncon) > 0) {
 		// Prepare variable...
-		$UIDs = '';
+		$userids = '';
 		$content['time'] = (getConfig('ap_unconfirmed_time')  / 60 / 60);
 
 		// Delete inactive accounts
 		while ($content = SQL_FETCHARRAY($result_uncon)) {
 			// Remember userids for the admin
-			$UIDs .= $content['userid'] . ', ';
+			$userids .= $content['userid'] . ', ';
 
 			// Get date/time from timestamp
 			$content['joined'] = generateDateTime($content['joined'], 0);
@@ -76,11 +76,11 @@ ORDER BY
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+		$userids = str_replace(', ', "\n", substr($userids, 0, -2));
 
 		// Send mail notification to admin
 		if (getConfig('ap_un_notify') == 'Y') {
-			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $UIDs, '');
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $userids, '');
 		} // END - if
 	} // END - if
 
diff --git a/inc/filters.php b/inc/filters.php
index 89af47dbfd..1b20ecccf7 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -448,7 +448,7 @@ function FILTER_COMPILE_EXTENSION ($code) {
 	// Compile {%cmd=some_value%} to get extension data
 	// Support cmd is:
 	//   - version -> getExtensionVersion() call
-	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^\}]+))%\}/', $code, $matches);
+	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
 	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
 	// Default is from OUTPUT_HTML
@@ -465,20 +465,55 @@ function FILTER_COMPILE_EXTENSION ($code) {
 			// @TODO This whole if-block is very static
 			if ($cmd == 'code') {
 				// Code asked for
-				$replacer = "\" . getCode('" . $matches[3][$key] . "') . \"";
+				$code = str_replace($matches[0][$key], "\" . getCode('" . $matches[4][$key] . "') . \"", $code);
 			} elseif (substr($cmd, 0, 3) == 'url') {
 				// Do we have JS-mode?
 				if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
 
 				// Handle an URL here
-				$replacer = "\" . encodeUrl(\"" . $matches[3][$key] . "\", " . $outputMode . ") . \"";
+				$replacer = "\" . encodeUrl(\"" . $matches[4][$key] . "\", " . $outputMode . ") . \"";
 
 				// Replace it
 				$code = str_replace($matches[0][$key], $replacer, $code);
+			} elseif (substr($cmd, 0, 6) == 'server') {
+				// Get data from $_SERVER by their respective functions
+				$serverCmd = explode(',', $cmd);
+				$serverCmd = $serverCmd[1];
 
-				// And continue with next entry
-				continue;
-			} elseif (substr($cmd, 0 , 3) == 'ext') {
+				// This will make 'foo_bar' to detectFooBar()
+				$functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $serverCmd . "')))";
+
+				// Replace it
+				$code = str_replace($matches[0][$key], "\" . call_user_func(" . $functionName . ") . \"", $code);
+			} elseif (substr($cmd, 0, 4) == 'user') {
+				// Extract user command
+				$userCmdArray = explode(',', $cmd);
+				$userCmd = $userCmdArray[1];
+
+				// Use current userid by default
+				$functionName = 'getMemberId()';
+
+				// User-related data, so is there a userid?
+				if (!empty($matches[4][$key])) {
+					// Do we have a userid or $userid?
+					if ($matches[4][$key] == '$userid') {
+						// Use dynamic call
+						$functionName = "getFetchedUserData('userid', \$userid, '" . $userCmd . "')";
+					} elseif ($matches[4][$key] > 0) {
+						// User data found
+						$functionName = "getFetchedUserData('userid', " . $matches[4][$key] . ", " . $userCmd . "')";
+					} // END - if
+				} // END - if
+
+				// Do we have another function to run (e.g. translations)
+				if (isset($userCmdArray[2])) {
+					// Surround the original function call with it
+					$functionName = $userCmdArray[2] . '(' . $functionName . ')';
+				} // END - if
+
+				// Now replace the code
+				$code = str_replace($matches[0][$key], "\" . " . $functionName . " . \"", $code);
+			} elseif (substr($cmd, 0, 3) == 'ext') {
 				// Get the extension command
 				$extCmd = explode(',', $cmd);
 				$extCmd = $extCmd[1];
@@ -487,14 +522,14 @@ function FILTER_COMPILE_EXTENSION ($code) {
 				$functionName = 'getExtension' . ucfirst(strtolower($extCmd));
 
 				// Construct call of the function
-				$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
+				$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)) . \"";
+
+				// Replace it and insert parameter for GET request
+				$code = str_replace($matches[0][$key], sprintf("&amp;ext=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $replacer), $code);
 			} else {
 				// Unknown command detected
 				debug_report_bug('Unknown command ' . $cmd . ' detected.');
 			}
-
-			// Replace it and insert parameter for GET request
-			$code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $cmd, $replacer), $code);
 		} // END - foreach
 	} // END - if
 
diff --git a/inc/functions.php b/inc/functions.php
index 9e3240ea54..4df8f56b0d 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -400,7 +400,7 @@ function detectExtraTemplatePath ($template) {
 }
 
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	global $DATA;
 
 	// Make sure all template names are lowercase!
@@ -409,53 +409,33 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	// Default 'nickname' if extension is not installed
 	$nick = '---';
 
-	// Prepare IP number and User Agent
-	$REMOTE_ADDR     = detectRemoteAddr();
-	$HTTP_USER_AGENT = detectUserAgent();
-
-	// Default admin
-	$ADMIN = getConfig('MAIN_TITLE');
-
-	// Is the admin logged in?
-	if (isAdmin()) {
-		// Get admin id
-		$adminId = getCurrentAdminId();
-
-		// Load Admin data
-		$ADMIN = getAdminEmail($adminId);
-	} // END - if
-
 	// Neutral email address is default
 	$email = getConfig('WEBMASTER');
 
-	// Expiration in a nice output format
-	// NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
-	if (getConfig('auto_purge') == '0') {
-		// Will never expire!
-		$EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
-	} else {
-		// Create nice date string
-		$EXPIRATION = createFancyTime(getConfig('auto_purge'));
-	}
-
 	// Is content an array?
 	if (is_array($content)) {
-		// Add expiration to array, $EXPIRATION is now deprecated!
-		$content['expiration'] = $EXPIRATION;
+		// Add expiration to array
+		if (getConfig('auto_purge') == '0') {
+			// Will never expire!
+			$content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE');
+		} else {
+			// Create nice date string
+			$content['expiration'] = createFancyTime(getConfig('auto_purge'));
+		}
 	} // END - if
 
 	// Load user's data
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content).'<br />');
-	if (($UID > 0) && (is_array($content))) {
+	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$userid},template={$template},content[]=".gettype($content).'<br />');
+	if (($userid > 0) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
-		if ((isExtensionActive('nickname')) && (isNicknameUsed($UID))) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />");
 			// Load by nickname
-			fetchUserData($UID, 'nickname');
+			fetchUserData($userid, 'nickname');
 		} else {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />");
 			/// Load by userid
-			fetchUserData($UID);
+			fetchUserData($userid);
 		}
 
 		// Merge data if valid
@@ -473,7 +453,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	if (isset($content['email'])) $email = $content['email'];
 
 	// Store email for some functions in global data array
-	// @TODO Do only use $contentn, not $DATA or raw variables
+	// @TODO Do only use $content, not $DATA or raw variables
 	$DATA['email'] = $email;
 
 	// Base directory
@@ -519,7 +499,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	// Is there some content?
 	if (empty($newContent)) {
 		// Compiling failed
-		$newContent = "Compiler error for template {$template}!\nUncompiled content:\n" . $GLOBALS['tpl_content'];
+		$newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'];
 
 		// Add last error if the required function exists
 		if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
@@ -2596,8 +2576,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
 		// Prepare content
 		$content = array(
 			'message'     => trim($message),
-			'backtrace'   => trim(debug_get_mailable_backtrace()),
-			'request_uri' => trim(getRequestUri())
+			'backtrace'   => trim(debug_get_mailable_backtrace())
 		);
 
 		// Send email to webmaster
@@ -3073,15 +3052,15 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 	if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode'];
 
 	// Generate receiver list
-	$RECEIVER = generateReceiverList($data['cat'], $data['receiver'], $mode);
+	$receiver = generateReceiverList($data['cat'], $data['receiver'], $mode);
 
 	// Receivers added?
-	if (!empty($RECEIVER)) {
+	if (!empty($receiver)) {
 		// Add bonus mail to queue
 		addBonusMailToQueue(
 		$data['subject'],
 		$data['text'],
-		$RECEIVER,
+		$receiver,
 		$data['points'],
 		$data['seconds'],
 		$data['url'],
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index d9aa9f8575..60a9d02731 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -399,12 +399,12 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
 
 // Sends out mail to all administrators
 // IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
-function sendAdminsEmails ($subj, $template, $content, $UID) {
+function sendAdminsEmails ($subj, $template, $content, $userid) {
 	// Trim template name
 	$template = trim($template);
 
 	// Load email template
-	$message = loadEmailTemplate($template, $content, $UID);
+	$message = loadEmailTemplate($template, $content, $userid);
 
 	// Check which admin shall receive this mail
 	$result = SQL_QUERY_ESC("SELECT `admin_id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `admin_id` ASC",
@@ -432,13 +432,13 @@ function sendAdminsEmails ($subj, $template, $content, $UID) {
 		if ($adminId == '-1') {
 			if (isExtensionActive('events')) {
 				// Add line to user events
-				EVENTS_ADD_LINE($subj, $message, $UID);
+				EVENTS_ADD_LINE($subj, $message, $userid);
 			} else {
 				// Log error for debug
-				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
+				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,userid=%s",
 					$template,
 					$subj,
-					$UID
+					$userid
 				));
 			}
 		} elseif ($adminId == '0') {
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 278ad21d4a..95705bc254 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -494,18 +494,18 @@ function SURFBAR_HANDLE_DEPLETED_VIEWS () {
 // Alert users which have URLs booked and are low on points amount
 function SURFBAR_HANDLE_LOW_POINTS () {
 	// Get all userids
-	$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
+	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
 
 	// "Walk" through all URLs
-	foreach ($UIDs['userid'] as $userid => $dummy) {
+	foreach ($userids['userid'] as $userid => $dummy) {
 		// Is the last notification far enougth away to notify again?
-		if ((time() - $UIDs['notified'][$userid]) >= getConfig('surfbar_low_interval')) {
+		if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) {
 			// Prepare content
 			$content = array(
 				'userid'      => $userid,
 				'low'      => translateComma(getConfig('surfbar_warn_low_points')),
-				'points'   => translateComma($UIDs['points'][$userid]),
-				'notified' => generateDateTime($UIDs['notified'][$userid]),
+				'points'   => translateComma($userids['points'][$userid]),
+				'notified' => generateDateTime($userids['notified'][$userid]),
 				'interval' => createFancyTime(getConfig('surfbar_low_interval'))
 			);
 
@@ -866,10 +866,10 @@ LIMIT 1",
 // Get total amount of URLs of given status for current user or of ACTIVE URLs by default
 function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	// Determine depleted user account
-	$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
+	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 	// If we dont get any user ids back, there are no URLs
-	if (count($UIDs['userid']) == '0') {
+	if (count($userids['userid']) == '0') {
 		// No user ids found, no URLs!
 		return 0;
 	} // END - if
@@ -877,13 +877,13 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	// Is the exlude userid set?
 	if ($excludeUserId > 0) {
 		// Then add it
-		$UIDs['userid'][$excludeUserId] = $excludeUserId;
+		$userids['userid'][$excludeUserId] = $excludeUserId;
 	} // END - if
 
 	// Get amount from database
 	$result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS cnt
 FROM `{?_MYSQL_PREFIX?}_surfbar_urls`
-WHERE `userid` NOT IN (".implode(', ', $UIDs['userid']).") AND `status`='%s'",
+WHERE `userid` NOT IN (".implode(', ', $userids['userid']).") AND `status`='%s'",
 		array($status), __FUNCTION__, __LINE__
 	);
 
@@ -1114,7 +1114,7 @@ LIMIT 1",
 // Determine which user hash no more points left
 function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Init array
-	$UIDs = array(
+	$userids = array(
 		'userid'      => array(),
 		'points'   => array(),
 		'notified' => array(),
@@ -1123,9 +1123,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Do we have a current user id?
 	if ((isMember()) && ($limit == '0')) {
 		// Then add this as well
-		$UIDs['userid'][getMemberId()]      = getMemberId();
-		$UIDs['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-		$UIDs['notified'][getMemberId()] = '0';
+		$userids['userid'][getMemberId()]      = getMemberId();
+		$userids['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+		$userids['notified'][getMemberId()] = '0';
 
 		// Get all userid except logged in one
 		$result = SQL_QUERY_ESC("SELECT
@@ -1171,9 +1171,9 @@ ORDER BY
 		if ($points <= $limit) {
 			// Ignore this one!
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']} has depleted points amount!", false);
-			$UIDs['userid'][$content['userid']]      = $content['userid'];
-			$UIDs['points'][$content['userid']]   = $points;
-			$UIDs['notified'][$content['userid']] = $content['notified'];
+			$userids['userid'][$content['userid']]      = $content['userid'];
+			$userids['points'][$content['userid']]   = $points;
+			$userids['notified'][$content['userid']] = $content['notified'];
 		} // END - if
 	} // END - while
 
@@ -1181,10 +1181,10 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getMemberId().')', false);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($userids)." (with own userid=".getMemberId().')', false);
 
 	// Return result
-	return $UIDs;
+	return $userids;
 }
 
 // Determine how many users are Online in surfbar
@@ -1424,7 +1424,7 @@ ORDER BY
 }
 
 // "Getter" for maximum random number
-function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) {
+function SURFBAR_GET_MAX_RANDOM ($userids, $add) {
 	// Count max availabe entries
 	$result = SQL_QUERY("SELECT sbu.id AS cnt
 FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
@@ -1432,7 +1432,7 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(',', $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
+WHERE sbu.userid NOT IN (".implode(',', $userids).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
 GROUP BY sbu.id", __FUNCTION__, __LINE__);
 
 	// Log last query
@@ -1540,10 +1540,10 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
 		} // END - if
 
 		// Determine depleted user account
-		$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
+		$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 		// Get maximum randomness factor
-		$maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['userid'], $add);
+		$maxRand = SURFBAR_GET_MAX_RANDOM($userids['userid'], $add);
 
 		// If more than one URL can be called generate the random number!
 		if ($maxRand > 1) {
@@ -1559,7 +1559,7 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(',', $UIDs['userid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
+WHERE sbu.userid NOT IN (".implode(',', $userids['userid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 7c81a67771..9bf3915639 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -104,7 +104,7 @@ if (!empty($sql)) {
 
 		// Load message body for bonus mails
 		$message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}');
-		$RECEIVER = ''; $UIDs = array();
+		$receiver = ''; $userids = array();
 
 		// Okay lets notify all users!
 		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
@@ -125,7 +125,7 @@ LIMIT 1",
 			// Load email template and send it to the user!
 			if ($sentBonusMails === true) {
 				// Add userid to queue
-				$UIDs[] = $content['userid'];
+				$userids[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
 				$message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']);
@@ -136,13 +136,13 @@ LIMIT 1",
 		// Shall I send out bonus mails?
 		if ($sentBonusMails === true) {
 			// Okay, make array to string
-			$RECEIVER = implode(';', $UIDs);
+			$receiver = implode(';', $userids);
 
 			// Prepare URL
 			$URL = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if
 
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 0bc9f191ec..5f0cee8371 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -89,7 +89,7 @@ if (!empty($sql)) {
 
 	// Load message body for bonus mails
 	$message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
-	$RECEIVER = ''; $UIDs = array();
+	$receiver = ''; $userids = array();
 
 	// Check for accounts to be notified
 	$result_main = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -112,7 +112,7 @@ LIMIT 1",
 			// Load email template and send it to the user!
 			if ($sentBonusMails === true) {
 				// Add userid to queue
-				$UIDs[] = $content['userid'];
+				$userids[] = $content['userid'];
 			} else {
 				// Send normal notification mail to the members
 				$message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
@@ -123,13 +123,13 @@ LIMIT 1",
 		// Shall I send out bonus mails?
 		if ($sentBonusMails === true) {
 			// Okay, make array to string
-			$RECEIVER = implode(';', $UIDs);
+			$receiver = implode(';', $userids);
 
 			// Prepare URL
 			$URL = 'modules.php?module=index&amp;what=login';
 
 			// Insert mail
-			addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+			addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
 		} // END - if
 	} // END - if
 
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 327e51147f..97aab22bfe 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -737,7 +737,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 function adminGetMenuMode () {
 	// Set the global mode as the mode for all admins
 	$mode = getConfig('admin_menu');
-	$ADMIN = $mode;
+	$adminMode = $mode;
 
 	// Get admin id
 	$adminId = getCurrentAdminId();
@@ -745,7 +745,7 @@ function adminGetMenuMode () {
 	// Check individual settings of current admin
 	if (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
 		// Load from cache
-		$ADMIN = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
+		$adminMode = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('admins', '0.6.7')) {
 		// Load from database when version of 'admins' is enough
@@ -753,7 +753,7 @@ function adminGetMenuMode () {
 			array($adminId), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
-			list($ADMIN) = SQL_FETCHROW($result);
+			list($adminMode) = SQL_FETCHROW($result);
 		}
 
 		// Free memory
@@ -761,7 +761,7 @@ function adminGetMenuMode () {
 	}
 
 	// Check what the admin wants and set it when it's not the global mode
-	if ($ADMIN != 'global') $mode = $ADMIN;
+	if ($adminMode != 'global') $mode = $adminMode;
 
 	// Return admin-menu's mode
 	return $mode;
diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 99c0ba0369..799414e0b6 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -53,8 +53,8 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 outputHtml('<div align="center">');
 
 // Check for possible running rallyes
-$ADMIN = " AND d.is_active='Y'";
-if (isAdmin()) $ADMIN = '';
+$ADD = " AND d.is_active='Y'";
+if (isAdmin()) $ADD = '';
 
 $result = SQL_QUERY("SELECT
 	d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
@@ -65,7 +65,7 @@ INNER JOIN
 ON
 	d.admin_id=a.id
 WHERE
-	d.notified='Y'".$ADMIN."
+	d.notified='Y'" . $ADD . "
 ORDER BY
 	d.end_time
 LIMIT 1", __FILE__, __LINE__);
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index d055bb5d8a..ee7f7de2dc 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -140,8 +140,7 @@ if (isFormSent()) {
 
 	if ((postRequestElement('email') != '!') && (getConfig('check_double_email') == 'Y')) {
 		// Does the email address already exists in our database?
-		$CHK = isEmailTaken(postRequestElement('email'));
-		if ($CHK === true) {
+		if ((!isAdmin()) && (isEmailTaken(postRequestElement('email')))) {
 			setRequestPostElement('email', '?');
 			$isOkay = false;
 		} // END - if
diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 74e03ce2fb..89ab90cfc4 100644
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -46,7 +46,6 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addMenuDescription('member', __FILE__);
 
-$UID = getMemberId();
 $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 
@@ -81,7 +80,7 @@ if ($cats > 0) {
 			switch ($joined) {
 				case 'Y':
 					$result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1",
-						array($UID, bigintval($cat)), __FILE__, __LINE__);
+						array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
 					if (SQL_NUMROWS($result_user) == '0') {
 						$sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
@@ -98,7 +97,7 @@ if ($cats > 0) {
 
 			if (!empty($sql)) {
 				// Run SQL command
-				SQL_QUERY_ESC(trim($sql), array($UID, bigintval($cat)), __FILE__, __LINE__);
+				SQL_QUERY_ESC(trim($sql), array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
 				// Count this row
 				$cnt += SQL_AFFECTEDROWS();
@@ -142,7 +141,7 @@ if ($cats > 0) {
 				}
 			} else {
 				// Check if he has an entry
-				if (countSumTotalData($UID, 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
+				if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
 					$content['jn'] = '';
 					$content['jy'] = ' checked="checked"';
 				}
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 5b86f5e55a..e5878cbe08 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -265,14 +265,14 @@ LIMIT 1",
 			SQL_FREERESULT($result);
 
 			// Implode array into string for the sending pool
-			$RECEIVER = implode($TEST, ';');
+			$receiver = implode($TEST, ';');
 
 			// Count array for maximum sent
 			$content['target_send'] = count($TEST);
 
 			// Update receiver list
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
-				array(convertReceivers($RECEIVER), $content['target_send']), __FILE__, __LINE__);
+				array(convertReceivers($receiver), $content['target_send']), __FILE__, __LINE__);
 
 			// Is calculated max receivers larger than wanted receivers then reset it
 			if ($content['target_send'] > postRequestElement('receiver')) $content['target_send'] = bigintval(postRequestElement('receiver'));
@@ -297,7 +297,7 @@ LIMIT 1",
 								getMemberId(),
 								postRequestElement('subject'),
 								postRequestElement('text'),
-								$RECEIVER,
+								$receiver,
 								bigintval(postRequestElement('type')),
 								postRequestElement('url'),
 								bigintval(postRequestElement('cat')),
@@ -313,7 +313,7 @@ LIMIT 1",
 								getMemberId(),
 								postRequestElement('subject'),
 								postRequestElement('text'),
-								$RECEIVER,
+								$receiver,
 								bigintval(postRequestElement('type')),
 								postRequestElement('url'),
 								bigintval(postRequestElement('cat')),
@@ -344,7 +344,7 @@ LIMIT 1",
 							array(
 								postRequestElement('subject'),
 								postRequestElement('text'),
-								$RECEIVER,
+								$receiver,
 								bigintval(postRequestElement('type')),
 								postRequestElement('url'),
 								bigintval(postRequestElement('cat')),
@@ -373,7 +373,7 @@ LIMIT 1",
 							array(
 								postRequestElement('subject'),
 								postRequestElement('text'),
-								$RECEIVER,
+								$receiver,
 								bigintval(postRequestElement('type')),
 								postRequestElement('url'),
 								bigintval(postRequestElement('cat')),
diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index d4010690df..3ad801d6d8 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -52,8 +52,9 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 } // END - if
 
 // Check for possible running rallyes
-$ADMIN = " AND d.is_active='Y'";
-if (isAdmin()) $ADMIN = '';
+$ADD = " AND d.is_active='Y'";
+if (isAdmin()) $ADD = '';
+
 $result = SQL_QUERY("SELECT
 	d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
 FROM
@@ -63,7 +64,7 @@ INNER JOIN
 ON
 	d.admin_id=a.id
 WHERE
-	d.notified='Y'".$ADMIN."
+	d.notified='Y'".$ADD."
 ORDER BY
 	d.end_time ASC
 LIMIT 1", __FILE__, __LINE__);
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index cbafb61cf8..993a122bb3 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -177,8 +177,8 @@ switch ($mode) {
 				sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message);
 
 				// At last send admin mail(s)
-				$ADMIN_SUBJ = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT);
-				sendAdminNotification($ADMIN_SUBJ, 'admin_transfer_points', $content);
+				$adminSubject = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT);
+				sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
 				// Transfer is completed
 				loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "<br /><a href=\"{%url=modules.php?module=login&amp;what=transfer%}\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 6297f28228..0e41c93d78 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -607,7 +607,7 @@ function isMember () {
 }
 
 // Fetch user data for given user id
-function fetchUserData ($userid, $column='userid') {
+function fetchUserData ($userid, $column = 'userid') {
 	// If we should look for userid secure&set it here
 	if (substr($column, -2, 2) == 'id') {
 		// Secure userid
@@ -2090,14 +2090,14 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 	if (SQL_NUMROWS($result) > 0) {
 		// Now load all userids for one big query!
 		// @TODO This can be somehow rewritten
-		$UIDs = array();
+		$userids = array();
 		while (list($userid) = SQL_FETCHROW($result)) {
-			$UIDs[$userid] = $userid;
+			$userids[$userid] = $userid;
 		} // END - while
 
 		// Now update all user accounts
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
-			array(implode(',', $UIDs), count($UIDs)), __FUNCTION__, __LINE__);
+			array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Free result
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 5c39bca3c0..9ab55f8806 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -73,19 +73,19 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 			// "Explode" all receivers into an array
 			if (ereg(';', $DATA['receivers'])) {
 				// There's more than one receiver in the list...
-				$RECEIVERS = explode(';', $DATA['receivers']);
+				$receiverS = explode(';', $DATA['receivers']);
 			} elseif (!empty($DATA['points'])) {
 				// Only one user left
-				$RECEIVERS = array($DATA['receivers']);
+				$receiverS = array($DATA['receivers']);
 			} else {
 				// No users left
-				$RECEIVERS = array(0);
+				$receiverS = array(0);
 			}
-			$dummy = $RECEIVERS;
+			$dummy = $receiverS;
 
 			// Now, if we are good little boys and girls Santa Claus left us some user-ids.
 			// We can now send mails to them...
-			foreach ($RECEIVERS as $key => $userid) {
+			foreach ($receiverS as $key => $userid) {
 				// Load personal data
 				if (fetchUserData($userid)) {
 					// The final receiver does exists so we can continue...
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 282f73fa0b..7848cdc0e6 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -78,19 +78,19 @@ if (SQL_NUMROWS($result_main) > 0) {
 			// "Explode" all receivers into an array
 			if (ereg(';', $DATA['receivers'])) {
 				// There's more than one receiver in the list...
-				$RECEIVERS = explode(';', $DATA['receivers']);
+				$receiverS = explode(';', $DATA['receivers']);
 			} elseif (!empty($DATA['receivers'])) {
 				// Only one user left
-				$RECEIVERS = array($DATA['receivers']);
+				$receiverS = array($DATA['receivers']);
 			} else {
 				// No users left
-				$RECEIVERS = array(0);
+				$receiverS = array(0);
 			}
-			$dummy = $RECEIVERS;
+			$dummy = $receiverS;
 
 			// Now, if we are good little boys and girls Santa Claus left us some user-ids.
 			// We can now send mails to them...
-			foreach ($RECEIVERS as $key => $userid) {
+			foreach ($receiverS as $key => $userid) {
 				// Lookup user id
 				//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*<br />");
 				if (fetchUserData($userid)) {
@@ -238,7 +238,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 					SQL_FREERESULT($result_stats);
 				} else {
 					// User does not exists so we have add the sender's points back to sender's account
-					if (($RECEIVERS['id'] == '0') || (empty($RECEIVERS['id']))) {
+					if (($receiverS['id'] == '0') || (empty($receiverS['id']))) {
 						// List was empty
 						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='SEND' WHERE `id`=%s LIMIT 1",
 							array(bigintval($DATA['id'])), __FILE__, __LINE__);
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 7e28564029..de2d8c0fdb 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -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
@@ -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]
 ?>
diff --git a/templates/de/emails/add-points.tpl b/templates/de/emails/add-points.tpl
index 8cba9e6de7..9c2f7b5e92 100644
--- a/templates/de/emails/add-points.tpl
+++ b/templates/de/emails/add-points.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} gutgeschrieben!
 
diff --git a/templates/de/emails/admin-del_links.tpl b/templates/de/emails/admin-del_links.tpl
index 31b8933d3d..b647a911f2 100644
--- a/templates/de/emails/admin-del_links.tpl
+++ b/templates/de/emails/admin-del_links.tpl
@@ -1,11 +1,11 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre unbest&auml;tigten Mails gel&ouml;scht!
 
 ------------------------------------
 Anzahl gel&ouml;schter Mails: $content
 ------------------------------------
-Ihre Mitglieder-Id bei uns lautet: $UID
+Ihre Mitglieder-Id bei uns lautet: $userid
 ------------------------------------
 
 Die {?POINTS?} sind somit verloren gegangen! Bitte seien Sie bald wieder aktiver, damit unsere Klickrate nicht unnoetigt sinkt.
diff --git a/templates/de/emails/admin/admin_holiday_deactivated.tpl b/templates/de/emails/admin/admin_holiday_deactivated.tpl
index 9804077e96..5bd45654bc 100644
--- a/templates/de/emails/admin/admin_holiday_deactivated.tpl
+++ b/templates/de/emails/admin/admin_holiday_deactivated.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} hat soeben seinen Urlaub beendet!
 
 ------------------------------
-Die Mitglieder-Id ist: $UID
+Die Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 Anfang des Urlaubes: $content[start]
 ------------------------------
diff --git a/templates/de/emails/admin/admin_holiday_request.tpl b/templates/de/emails/admin/admin_holiday_request.tpl
index d7fb40e8ee..cba76d91ff 100644
--- a/templates/de/emails/admin/admin_holiday_request.tpl
+++ b/templates/de/emails/admin/admin_holiday_request.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} hat soeben Urlaub beantragt!
 
 ------------------------------
-Die Mitglieder-Id ist: $UID
+Die Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 Anfang des Urlaubes: $content[start_day].$content[start_month].$content[start_year]
 ------------------------------
diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl
index efb9e42a09..ab4566caac 100644
--- a/templates/de/emails/admin/admin_mydata_notify.tpl
+++ b/templates/de/emails/admin/admin_mydata_notify.tpl
@@ -3,22 +3,22 @@ Hallo Administrator,
 {--ADMIN_MEMBER_CHANGED_PROFILE--}
 
 ------------------------------------------
-{--MEMBER_UID--}: $UID
+{--MEMBER_UID--}: $userid
 ------------------------------------------
-{--GENDER--}: $content[gender]
-{--SURNAME--}: $content[surname]
-{--FAMILY_NAME--}: $content[family]
-{--STREET_NR--}: $content[street_nr]
+{--GENDER--}: {%user,gender,translateGender=$userid%}
+{--SURNAME--}: {%user,surname=$userid%}
+{--FAMILY_NAME--}: {%user,family=$userid%}
+{--STREET_NR--}: {%user,street_nr=$userid%}
 {--COUNTRY--}: $content[country]
-{--ZIP--}: $content[zip]
-{--CITY--}: $content[city]
-{--EMAIL_ADDRESS--}: $content[email]
+{--ZIP--}: {%user,zip=$userid%}
+{--CITY--}: {%user,city=$userid%}
+{--EMAIL_ADDRESS--}: {%user,email=$userid%}
 ------------------------------------------
 $content[message]
 ------------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/admin/admin_newsletter_reset.tpl b/templates/de/emails/admin/admin_newsletter_reset.tpl
index 47875a50aa..c8d5e791d3 100644
--- a/templates/de/emails/admin/admin_newsletter_reset.tpl
+++ b/templates/de/emails/admin/admin_newsletter_reset.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} wurde zum Newsletterempfang wieder freigegeben.
 
 ------------------------------
-Die Mitglieder-Id ist: $UID
+Die Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 
 Das Mitglied wurde ebenfalls dar&uuml;ber in Kenntnis gesetzt! Die zugehoerige Aufgabe wurde nicht gel&ouml;scht.
diff --git a/templates/de/emails/admin/admin_payout_request.tpl b/templates/de/emails/admin/admin_payout_request.tpl
index 237a93feaf..d9b3a7c54c 100644
--- a/templates/de/emails/admin/admin_payout_request.tpl
+++ b/templates/de/emails/admin/admin_payout_request.tpl
@@ -8,16 +8,16 @@ Eines Ihrer Mitglieder hat soeben eine Auszahlungsanfrage an uns gesandt.
 
 Es hat dabei folgende Angaben gemacht:
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungsart: $content[type]
 Auszahlungshoehe: $content[payout]
diff --git a/templates/de/emails/admin/admin_payout_request_banner.tpl b/templates/de/emails/admin/admin_payout_request_banner.tpl
index adf60a51fb..6dc50df32f 100644
--- a/templates/de/emails/admin/admin_payout_request_banner.tpl
+++ b/templates/de/emails/admin/admin_payout_request_banner.tpl
@@ -8,16 +8,16 @@ Eines Ihrer Mitglieder hat soeben eine Auszahlungsanfrage an uns gesandt.
 
 Es hat dabei folgende Angaben gemacht:
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungsart: $content[type]
 Auszahlungshoehe: $content[payout]
diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl
index 3e458a7372..07723a3304 100644
--- a/templates/de/emails/admin/admin_refback.tpl
+++ b/templates/de/emails/admin/admin_refback.tpl
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
-Das Mitglied $UID hat soeben Ref-Back f&uuml;r ein anderes Mitglied eingestellt.
+Das Mitglied $userid hat soeben Ref-Back f&uuml;r ein anderes Mitglied eingestellt.
 
 ------------------------------
 Mitglied-Id: $content[refid] (der den Ref-Back bekommt)
diff --git a/templates/de/emails/admin/admin_report_bug.tpl b/templates/de/emails/admin/admin_report_bug.tpl
index 3c27d94fe9..ae29a3ebcb 100644
--- a/templates/de/emails/admin/admin_report_bug.tpl
+++ b/templates/de/emails/admin/admin_report_bug.tpl
@@ -8,7 +8,13 @@ Fehlermeldung: $content[message]
 Backtrace:
 $content[backtrace]
 ------------------------------
-Abfrage-String: $content[request_uri]
+Abfrage-String: {%server,request_uri%}
+------------------------------
+Verwendeter Browser: {%server,user_agent%}
+------------------------------
+IP-Nummer: {%server,remote_addr%}
+------------------------------
+User-Id: {%user,userid%}
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/admin/admin_reset_password.tpl b/templates/de/emails/admin/admin_reset_password.tpl
index b051cff512..fdf744f9a9 100644
--- a/templates/de/emails/admin/admin_reset_password.tpl
+++ b/templates/de/emails/admin/admin_reset_password.tpl
@@ -13,9 +13,9 @@ $content[login]
 
 Sollten Sie dies nicht gewesen sein, so ignorieren Sie einfach diese Mail. Hier sind die IP-Nummer und Browserbezeichnung:
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl
index 9fdb52f866..7642286339 100644
--- a/templates/de/emails/admin/admin_support-ordr.tpl
+++ b/templates/de/emails/admin/admin_support-ordr.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zum Mailversand.
 
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl
index 949c395901..835125023e 100644
--- a/templates/de/emails/admin/admin_support-reflink.tpl
+++ b/templates/de/emails/admin/admin_support-reflink.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinem Referal-Link.
 
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl
index 00172ef59a..cc6a10c29b 100644
--- a/templates/de/emails/admin/admin_support-unconfirmed.tpl
+++ b/templates/de/emails/admin/admin_support-unconfirmed.tpl
@@ -3,15 +3,15 @@ Hallo Administrator,
 Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinen unbest&auml;tigten Mails.
 
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
index efe388dd3a..2fb618dfa2 100644
--- a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
index 2834730a99..25fd559bbf 100644
--- a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url] (Neu: $content[edit][url])
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
index b13942774f..e91ff8ae3f 100644
--- a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
index c164436e40..eaf423de2d 100644
--- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl
@@ -6,7 +6,7 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
 $content[frametester]
diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
index 8a018a02af..6237f0d3a3 100644
--- a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
index 220c2585f7..66de57b54d 100644
--- a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
index c9df94b3a3..113f682058 100644
--- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl
@@ -6,7 +6,7 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
 $content[frametester]
diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
index 0796bb81dd..d7b7aabda1 100644
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
index aa7674f427..20909541df 100644
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url] (Neu: $content[edit][url])
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
index 4d8b9835ae..f216e77aa7 100644
--- a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl
index 062f964571..84e9913c4e 100644
--- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl
@@ -6,7 +6,7 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
 $content[frametester]
diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
index ca090d17cd..04a0a8dd13 100644
--- a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl
index fb6856ce58..59cf71cdd5 100644
--- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl
@@ -6,7 +6,7 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
 $content[frametester]
diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
index 7f794dcc13..ee05680b01 100644
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
index d1f8b0b094..070986f2d1 100644
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url]
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
index 2075f894f8..1b6a373dc1 100644
--- a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
+++ b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
@@ -6,9 +6,9 @@ Hier sind alle Daten dazu:
 ------------------------------------------
 Mitglieder-Id: $content[userid]
 ------------------------------------------
-Email: $content[email]
+Email: {%user,email=$userid%}
 ------------------------------------------
-Name: $content[surname] $content[family]
+Name: {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------------------
 Gebuchte URL: $content[url] (Neu: $content[edit][url])
 ------------------------------------------
diff --git a/templates/de/emails/admin/admin_transfer_points.tpl b/templates/de/emails/admin/admin_transfer_points.tpl
index fcfc271795..07686687d8 100644
--- a/templates/de/emails/admin/admin_transfer_points.tpl
+++ b/templates/de/emails/admin/admin_transfer_points.tpl
@@ -16,8 +16,8 @@ Mitglieder-Id: $content[sender][userid]
 Vollst. Name: $content[sender][gender] $content[sender][surname] $content[sender][family]
 Email-Adresse: $content[sender][email]
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
-Browser  : $HTTP_USER_AGENT
+IP-Nummer: {%server,remote_addr%}
+Browser  : {%server,user_agent%}
 ------------------------------
 Verwendungszweck: $content[reason]
 ------------------------------
diff --git a/templates/de/emails/admin/admin_wernis_request.tpl b/templates/de/emails/admin/admin_wernis_request.tpl
index 0099872956..b46ccf1244 100644
--- a/templates/de/emails/admin/admin_wernis_request.tpl
+++ b/templates/de/emails/admin/admin_wernis_request.tpl
@@ -8,16 +8,16 @@ Eines Ihrer Mitglieder hat soeben eine Auszahlungsanfrage an uns gesandt.
 
 Es hat dabei folgende Angaben gemacht:
 ------------------------------
-Seine Mitglieder-Id ist: $UID
+Seine Mitglieder-Id ist: $userid
 ------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungshoehe: $content[payout]
 An Konto: $content[account]
diff --git a/templates/de/emails/admins/admins_mail_contct_admin.tpl b/templates/de/emails/admins/admins_mail_contct_admin.tpl
index 89070e658b..5c0f4619d8 100644
--- a/templates/de/emails/admins/admins_mail_contct_admin.tpl
+++ b/templates/de/emails/admins/admins_mail_contct_admin.tpl
@@ -5,9 +5,9 @@ ein anderer Administrator hat Ihnen soeben eine Mail geschickt!
 ------------------------------------
 $content
 ------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/admins/admins_msg_contct_admin.tpl b/templates/de/emails/admins/admins_msg_contct_admin.tpl
index bea8671a50..911a66a651 100644
--- a/templates/de/emails/admins/admins_msg_contct_admin.tpl
+++ b/templates/de/emails/admins/admins_msg_contct_admin.tpl
@@ -5,9 +5,9 @@ ein anderer Administrator hat Ihnen soeben eine Nachricht in Ihren Account gesch
 ------------------------------------
 $content
 ------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/back-member.tpl b/templates/de/emails/back-member.tpl
index 8e35d16a5f..f8357fcf8e 100644
--- a/templates/de/emails/back-member.tpl
+++ b/templates/de/emails/back-member.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Eine Buchung von Ihnen konnte nich vollst&auml;ndig ausgesendet werden. Wir haben Ihnen $content[points] {?POINTS?} wieder gutgeschrieben!
 
diff --git a/templates/de/emails/beg/beg_di_notify.tpl b/templates/de/emails/beg/beg_di_notify.tpl
index e8aa14f833..6591efdb5c 100644
--- a/templates/de/emails/beg/beg_di_notify.tpl
+++ b/templates/de/emails/beg/beg_di_notify.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} die laufende Bettel-Rallye wieder angehalten. Vielleicht werden wir bald wieder eine neuen Bettel-Rallye starten.
diff --git a/templates/de/emails/beg/beg_en_notify.tpl b/templates/de/emails/beg/beg_en_notify.tpl
index 406d3a9d74..668c29d866 100644
--- a/templates/de/emails/beg/beg_en_notify.tpl
+++ b/templates/de/emails/beg/beg_en_notify.tpl
@@ -1,9 +1,9 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Ihr Bettel-Link lautet: {?URL?}/beg.php?userid=$UID
+Ihr Bettel-Link lautet: {?URL?}/beg.php?userid=$userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} eine Bettel-Rallye gestartet.
diff --git a/templates/de/emails/beg/beg_en_notify_body.tpl b/templates/de/emails/beg/beg_en_notify_body.tpl
index 06f7d6ff68..476f1edda5 100644
--- a/templates/de/emails/beg/beg_en_notify_body.tpl
+++ b/templates/de/emails/beg/beg_en_notify_body.tpl
@@ -1,5 +1,5 @@
 ------------------------------
-Ihr Bettel-Link lautet: {?URL?}/beg.php?userid=$UID
+Ihr Bettel-Link lautet: {?URL?}/beg.php?userid=$userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} eine Bettel-Rallye gestartet.
diff --git a/templates/de/emails/bonus-mail.tpl b/templates/de/emails/bonus-mail.tpl
index fc799309df..8498c28ca1 100644
--- a/templates/de/emails/bonus-mail.tpl
+++ b/templates/de/emails/bonus-mail.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Hier kommt eine Bonus-Mail von uns zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
@@ -20,7 +20,7 @@ Beworbene URL: $content[url]
 Hinweis: Angesammelte {?POINTS?} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {?MAIN_TITLE?} Mitglied sein oder werden.
 
 Um Ihre $content[points] {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{?URL?}/mailid.php?userid=$UID&bonusid=$content[id]
+{?URL?}/mailid.php?userid=$userid&bonusid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
diff --git a/templates/de/emails/bonus/bonus_di_notify.tpl b/templates/de/emails/bonus/bonus_di_notify.tpl
index fa07e214ec..3bbf3f839f 100644
--- a/templates/de/emails/bonus/bonus_di_notify.tpl
+++ b/templates/de/emails/bonus/bonus_di_notify.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} die laufende Aktiv-Rallye wieder angehalten. Vielleicht werden
diff --git a/templates/de/emails/bonus/bonus_en_notify.tpl b/templates/de/emails/bonus/bonus_en_notify.tpl
index fb6d3a032d..c2eabc53a9 100644
--- a/templates/de/emails/bonus/bonus_en_notify.tpl
+++ b/templates/de/emails/bonus/bonus_en_notify.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} eine Aktiv-Rallye gestartet.
diff --git a/templates/de/emails/confirm-member.tpl b/templates/de/emails/confirm-member.tpl
index 8dde50cdb8..abb5253266 100644
--- a/templates/de/emails/confirm-member.tpl
+++ b/templates/de/emails/confirm-member.tpl
@@ -1,10 +1,10 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre Email-Adresse best&auml;tigt und sind somit f&uuml;r den {?mt_word?} {?MAIN_TITLE?} freigeschaltet!
 
 Sie k&ouml;nnen sich nun hier einloggen:
 
-Ihre Login-Id lautet: $UID
+Ihre Login-Id lautet: $userid
 URL zum Login: {?URL?}/login.php
 
 f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $content[points] {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
diff --git a/templates/de/emails/confirm-referral.tpl b/templates/de/emails/confirm-referral.tpl
index b2a8536a06..799045bb27 100644
--- a/templates/de/emails/confirm-referral.tpl
+++ b/templates/de/emails/confirm-referral.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben heute ein neues Mitglied f&uuml;r unseren {?mt_word?} geworben!
 
diff --git a/templates/de/emails/del-user.tpl b/templates/de/emails/del-user.tpl
index 5ac30bfbf9..51e02a211e 100644
--- a/templates/de/emails/del-user.tpl
+++ b/templates/de/emails/del-user.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihren Account gel&ouml;scht!
 
@@ -6,7 +6,7 @@ Grund der Loeschung war folgender:
 ------------------------------------
 $content[text]
 ------------------------------------
-Ihre Mitglieder-Id war: $UID
+Ihre Mitglieder-Id war: $userid
 ------------------------------------
 
 Wir w&uuml;nschen Ihnen weiterhin noch alles Gute und k&ouml;nnen Sie vielleicht irgentwann einmal wieder begruessen.
diff --git a/templates/de/emails/done-member.tpl b/templates/de/emails/done-member.tpl
index 48b3086ce9..4a507a5d22 100644
--- a/templates/de/emails/done-member.tpl
+++ b/templates/de/emails/done-member.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte Mail wurde soeben vollst&auml;ndig von unserem System versendet! Wir w&uuml;nschen Ihnen viel Erfolg mit Ihrer Werbebuchung!
 
diff --git a/templates/de/emails/guest/guest_request_confirm.tpl b/templates/de/emails/guest/guest_request_confirm.tpl
index fb602cc791..94f6c844a8 100644
--- a/templates/de/emails/guest/guest_request_confirm.tpl
+++ b/templates/de/emails/guest/guest_request_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten sich zu unserem {?mt_word?} {?MAIN_TITLE?} angemeldet und heute Ihren Best&auml;tigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse best&auml;tigt. Diesen Schritt k&ouml;nnen Sie jetzt nachholen. Danach k&ouml;nnen Sie sich im Mitgliedsbereich einloggen.
 
diff --git a/templates/de/emails/lock-user.tpl b/templates/de/emails/lock-user.tpl
index e3cae999e2..efc454d731 100644
--- a/templates/de/emails/lock-user.tpl
+++ b/templates/de/emails/lock-user.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
-Ihre Mitglieder-Id bei uns: $UID
+Ihre Mitglieder-Id bei uns: $userid
 --------------
 
 Ihr Account wurde von einem unserer Administratoren gesperrt! Bitte halten Sie sich an unsere AGBs.
diff --git a/templates/de/emails/member/member_autopurge_inactive.tpl b/templates/de/emails/member/member_autopurge_inactive.tpl
index 6a94d2e38a..3235cca8d9 100644
--- a/templates/de/emails/member/member_autopurge_inactive.tpl
+++ b/templates/de/emails/member/member_autopurge_inactive.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Sie sind seit geraumer Zeit in unserem {?mt_word?} nicht mehr aktiv gewesen. Sie waren seit dem $content[last_online] nicht mehr eingeloggt oder haben keine Mail best&auml;tigt!
diff --git a/templates/de/emails/member/member_autopurge_points.tpl b/templates/de/emails/member/member_autopurge_points.tpl
index 3c8b63ef8b..9682d81636 100644
--- a/templates/de/emails/member/member_autopurge_points.tpl
+++ b/templates/de/emails/member/member_autopurge_points.tpl
@@ -1,9 +1,9 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der automatischen Loeschung von Best&auml;tigungslinks wurden Ihnen $content {?POINTS?} wieder gutgeschrieben!
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl
index a8bf40b382..6a1737e567 100644
--- a/templates/de/emails/member/member_beg.tpl
+++ b/templates/de/emails/member/member_beg.tpl
@@ -1,11 +1,11 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content[points] {?POINTS?} gewonnen!
 
 Herzlichen Gl&uuml;ckwunsch!
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/member/member_birthday.tpl b/templates/de/emails/member/member_birthday.tpl
index 4c57660de9..5138ffe18b 100644
--- a/templates/de/emails/member/member_birthday.tpl
+++ b/templates/de/emails/member/member_birthday.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir das Team von {?MAIN_TITLE?} w&uuml;nschen Ihnen alles Gute und Gesundheit zu Ihrem $content. Geburtstag!
 
diff --git a/templates/de/emails/member/member_birthday_confirm.tpl b/templates/de/emails/member/member_birthday_confirm.tpl
index 5d4554f7e2..a485184ebf 100644
--- a/templates/de/emails/member/member_birthday_confirm.tpl
+++ b/templates/de/emails/member/member_birthday_confirm.tpl
@@ -1,11 +1,11 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir das Team von {?MAIN_TITLE?} w&uuml;nschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
 Wenn Sie den folgenden Link anklicken, erhalten Sie $content[points] {?POINTS?} Ihrem Account sofort gutgeschrieben!
 
 ----------------------------------------------------------------------
-{?URL?}/birthday_confirm.php?userid=$UID&check=$content[check]
+{?URL?}/birthday_confirm.php?userid=$userid&check=$content[check]
 ----------------------------------------------------------------------
 
 Diese Mail wurde automatisch versandt.
diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl
index 19f2813ffc..066a635515 100644
--- a/templates/de/emails/member/member_bonus.tpl
+++ b/templates/de/emails/member/member_bonus.tpl
@@ -1,11 +1,11 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content[points] {?POINTS?} gewonnen!
 
 Herzlichen Gl&uuml;ckwunsch!
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/member/member_contct.tpl b/templates/de/emails/member/member_contct.tpl
index 26f7bacddb..0cbdbfe11b 100644
--- a/templates/de/emails/member/member_contct.tpl
+++ b/templates/de/emails/member/member_contct.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 Ihre Mitglied-Id lautet: $content[userid]
diff --git a/templates/de/emails/member/member_doubler.tpl b/templates/de/emails/member/member_doubler.tpl
index 8f3234c4d6..025c1150ca 100644
--- a/templates/de/emails/member/member_doubler.tpl
+++ b/templates/de/emails/member/member_doubler.tpl
@@ -1,9 +1,9 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir haben Ihnen soeben $content[points] {?POINTS?} durch eine Verdoppelung vom $content[when] Ihrem Account gutgeschrieben!
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 Doppler-Transaktionsnummer: $content[id]
 Ihre IP-Nummer lautete: $content[ip]
 ------------------------------
diff --git a/templates/de/emails/member/member_holiday_activated.tpl b/templates/de/emails/member/member_holiday_activated.tpl
index 1f5ca3e528..e66f3dfc27 100644
--- a/templates/de/emails/member/member_holiday_activated.tpl
+++ b/templates/de/emails/member/member_holiday_activated.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Zeitpunkt Ihrer Beantragung: $content[activated] Uhr
 ------------------------------
diff --git a/templates/de/emails/member/member_holiday_removed.tpl b/templates/de/emails/member/member_holiday_removed.tpl
index 3cb96be145..ffe3a8baf5 100644
--- a/templates/de/emails/member/member_holiday_removed.tpl
+++ b/templates/de/emails/member/member_holiday_removed.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns &uuml;bermittelt:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[start]
 ------------------------------
diff --git a/templates/de/emails/member/member_holiday_request.tpl b/templates/de/emails/member/member_holiday_request.tpl
index 18bfbae8b7..16940341b3 100644
--- a/templates/de/emails/member/member_holiday_request.tpl
+++ b/templates/de/emails/member/member_holiday_request.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[start_day].$content[start_month].$content[start_year]
 ------------------------------
diff --git a/templates/de/emails/member/member_holiday_unlock.tpl b/templates/de/emails/member/member_holiday_unlock.tpl
index 424f743303..52c7283df7 100644
--- a/templates/de/emails/member/member_holiday_unlock.tpl
+++ b/templates/de/emails/member/member_holiday_unlock.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns &uuml;bermittelt:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[holiday_start]
 ------------------------------
diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl
index d39cb57c68..f049c6397b 100644
--- a/templates/de/emails/member/member_mydata_notify.tpl
+++ b/templates/de/emails/member/member_mydata_notify.tpl
@@ -1,22 +1,22 @@
-Hallo $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 {--MEMBER_HAVE_CHANGED_DATA--}
 
 {--YOUR_NEW_DATA--}:
 ------------------------------------------
-{--GENDER--}: $content[gender]
-{--SURNAME--}: $content[surname]
-{--FAMILY_NAME--}: $content[family]
-{--STREET_NR--}: $content[street_nr]
+{--GENDER--}: {%user,gender,translateGender=$userid%}
+{--SURNAME--}: {%user,surname=$userid%}
+{--FAMILY_NAME--}: {%user,family=$userid%}
+{--STREET_NR--}: {%user,street_nr=$userid%}
 {--COUNTRY--}: $content[country]
-{--ZIP--}: $content[zip]
-{--CITY--}: $content[city]
-{--EMAIL_ADDRESS--}: $content[email]
+{--ZIP--}: {%user,zip=$userid%}
+{--CITY--}: {%user,city=$userid%}
+{--EMAIL_ADDRESS--}: {%user,email=$userid%}
 {--PASS_1--}: $content[pass1]
 ------------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------------
 
 {--PLEASE_NOTIFY_ABUSE_MYDATA--}
diff --git a/templates/de/emails/member/member_payout_accepted.tpl b/templates/de/emails/member/member_payout_accepted.tpl
index 4808e877e9..958200d273 100644
--- a/templates/de/emails/member/member_payout_accepted.tpl
+++ b/templates/de/emails/member/member_payout_accepted.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 
 Nachricht vom Admin:
diff --git a/templates/de/emails/member/member_payout_rejected.tpl b/templates/de/emails/member/member_payout_rejected.tpl
index 94e742266c..a76b13ecc6 100644
--- a/templates/de/emails/member/member_payout_rejected.tpl
+++ b/templates/de/emails/member/member_payout_rejected.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 
 Nachricht vom Admin:
diff --git a/templates/de/emails/member/member_payout_request.tpl b/templates/de/emails/member/member_payout_request.tpl
index 64600dd875..0340ba6661 100644
--- a/templates/de/emails/member/member_payout_request.tpl
+++ b/templates/de/emails/member/member_payout_request.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungsart: $content[type]
 Auszahlungshoehe: $content[payout]
diff --git a/templates/de/emails/member/member_payout_request_banner.tpl b/templates/de/emails/member/member_payout_request_banner.tpl
index 8c58f78069..79798c8e52 100644
--- a/templates/de/emails/member/member_payout_request_banner.tpl
+++ b/templates/de/emails/member/member_payout_request_banner.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungsart: $content[type]
 Auszahlungshoehe: $content[payout]
diff --git a/templates/de/emails/member/member_rallye_expired.tpl b/templates/de/emails/member/member_rallye_expired.tpl
index 6151c4ca4d..5069c20887 100644
--- a/templates/de/emails/member/member_rallye_expired.tpl
+++ b/templates/de/emails/member/member_rallye_expired.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Herzlichen Gl&uuml;ckwunsch, Sie haben soeben den $DATA[level]. Platz in unserer aktuellen Referal-Rallye gemacht!
diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl
index a65bfa9911..648cbcc23e 100644
--- a/templates/de/emails/member/member_rallye_expired_bronce.tpl
+++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Bronze-Gewinner unserer Referal-Rallye!
diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl
index 00d6c69ed7..c24f5e7b97 100644
--- a/templates/de/emails/member/member_rallye_expired_gold.tpl
+++ b/templates/de/emails/member/member_rallye_expired_gold.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Gold-Gewinner unserer Referal-Rallye!
diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl
index 3fcee309b9..7bcf852671 100644
--- a/templates/de/emails/member/member_rallye_expired_silver.tpl
+++ b/templates/de/emails/member/member_rallye_expired_silver.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Silber-Gewinner unserer Referal-Rallye!
diff --git a/templates/de/emails/member/member_rallye_notify.tpl b/templates/de/emails/member/member_rallye_notify.tpl
index 751d598f2c..5968033ea8 100644
--- a/templates/de/emails/member/member_rallye_notify.tpl
+++ b/templates/de/emails/member/member_rallye_notify.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 
 Soeben haben wir von {?MAIN_TITLE?} eine neue Referal-Rallye gestartet!
@@ -16,7 +16,7 @@ Server-Zeit: $content[now_t] Uhr
 ------------------------------
 $content[prices]
 Ihr Werbelink zum Werben neuer Mitglieder:
-{?URL?}/ref.php?refid=$UID
+{?URL?}/ref.php?refid=$userid
 ------------------------------
 
 Weitere Werbebanner, sowie alle weiteren n&ouml;tigen Daten finden Sie im Mitgliedsbereich unter *Refs-Banner* !
diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl
index e36fe37404..8b5e55b710 100644
--- a/templates/de/emails/member/member_refback.tpl
+++ b/templates/de/emails/member/member_refback.tpl
@@ -1,6 +1,6 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Das Mitglied $UID hat Ihnen soeben Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben.
+Das Mitglied $userid hat Ihnen soeben Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben.
 
 ------------------------------
 Ihr Mitglieder-Id ist: $content[refid]
diff --git a/templates/de/emails/member/member_stats_bonus.tpl b/templates/de/emails/member/member_stats_bonus.tpl
index bc0416d1d3..d0898ba76d 100644
--- a/templates/de/emails/member/member_stats_bonus.tpl
+++ b/templates/de/emails/member/member_stats_bonus.tpl
@@ -1,9 +1,9 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben $content[points] {?POINTS?} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
 Betreff: $content[subject]
 ------------------------------
diff --git a/templates/de/emails/member/member_support-ordr.tpl b/templates/de/emails/member/member_support-ordr.tpl
index c56c7dcf3d..b0c49d3327 100644
--- a/templates/de/emails/member/member_support-ordr.tpl
+++ b/templates/de/emails/member/member_support-ordr.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl
index 4849fa9705..79b948e775 100644
--- a/templates/de/emails/member/member_support-reflink.tpl
+++ b/templates/de/emails/member/member_support-reflink.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten eine Frage zu Ihrem Referal-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl
index 2408e9d6f4..9666e0af25 100644
--- a/templates/de/emails/member/member_support-unconfirmed.tpl
+++ b/templates/de/emails/member/member_support-unconfirmed.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten uns wegen Ihrer unbest&auml;tigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
-E-Mail Adresse: $content[email]
+E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: $content[gender] $content[surname] $content[family]
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]
diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl
index 50324b8336..0c23e7a770 100644
--- a/templates/de/emails/member/member_surfbar_low_points.tpl
+++ b/templates/de/emails/member/member_surfbar_low_points.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von $content[low] {?POINTS?} gefallen. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen.
 
diff --git a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
index 634d8c7c5c..5ff293f000 100644
--- a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre freigegebene URL gel&ouml;scht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
diff --git a/templates/de/emails/member/member_surfbar_url_active_pending.tpl b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
index 16ec7be6fa..42d479ea27 100644
--- a/templates/de/emails/member/member_surfbar_url_active_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre freigegebene URL ge&auml;ndert. Dabei wurde sie auf "Wartend" gestellt.
 
diff --git a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
index 49a453bc8e..69e199cc20 100644
--- a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gebuchte URL gestoppt.
 
diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
index ffc3b8870a..681da41adf 100644
--- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl
+++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben in unserer Surfbar freigegeben.
 
diff --git a/templates/de/emails/member/member_surfbar_url_depleted.tpl b/templates/de/emails/member/member_surfbar_url_depleted.tpl
index 10e03a0e5c..ac28574e44 100644
--- a/templates/de/emails/member/member_surfbar_url_depleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_depleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben angehalten, da die maximalen Einblendungen verbraucht sind.
 
diff --git a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
index f4b2fdfe23..8f6db437ae 100644
--- a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre gesperrte URL gel&ouml;scht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
diff --git a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
index 4fe21ae7bf..bd041376a1 100644
--- a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gesperrte URL erneut gebucht. Dabei wurde sie auf "Wartend" gestellt. Bitte beachten Sie hierbei, dass Missbrauch dieser Funktion zur Sperrung Ihres Accounts auf {?MAIN_TITLE?} f&uuml;hren kann.
 
diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl
index 72f46a0093..02840da126 100644
--- a/templates/de/emails/member/member_surfbar_url_migrate.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 durch Freischaltung einer Mailbuchung wurde Ihre gebuche URL in die Surfbar migriert.
 
diff --git a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
index 000d939a43..a6388a7441 100644
--- a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gel&ouml;scht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
diff --git a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
index af3ca4eb4c..3c3bd9e600 100644
--- a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL ge&auml;ndert. Bitte buchen Sie diese, wenn Sie dies w&uuml;nschen.
 
diff --git a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
index f954aeb976..3e700b3279 100644
--- a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gebucht. Dabei wurde sie auf "Wartend" gestellt.
 
diff --git a/templates/de/emails/member/member_surfbar_url_pending.tpl b/templates/de/emails/member/member_surfbar_url_pending.tpl
index 68ae870190..de3392b771 100644
--- a/templates/de/emails/member/member_surfbar_url_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 vielen Dank f&uuml;r Ihre Zusatzbuchung Ihrer URL in unserer Surfbar.
 
diff --git a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
index 8310ee5f8b..d75e143625 100644
--- a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine in unserer Surfbar gebuchte URL zur&uuml;ckgenommen. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl
index e8dd8a161f..457bfc0a47 100644
--- a/templates/de/emails/member/member_surfbar_url_reg.tpl
+++ b/templates/de/emails/member/member_surfbar_url_reg.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine URL in der Surfbar gebucht.
 
diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl
index 2b1d177583..8ab50181cd 100644
--- a/templates/de/emails/member/member_surfbar_url_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde von uns in unserer Surfbar abgelehnt. Bitte halten Sie sich an unsere AGBs und binden Sie keine Framekiller in Ihre Webseite ein. Diese st&ouml;ren unsere Surfbar.
 
diff --git a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
index d877258123..d948042408 100644
--- a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gestoppte URL gestartet. Dabei wurde sie auf "Wartend" gestellt.
 
diff --git a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
index e534f9842b..c94a4fd1c7 100644
--- a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre gestoppte URL gel&ouml;scht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
diff --git a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
index 1d517c1820..e6f58c5671 100644
--- a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gestoppte URL ge&auml;ndert. Dabei wurde sie auf "Wartend" gestellt.
 
diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl
index 91e955dc93..7542f2b612 100644
--- a/templates/de/emails/member/member_surfbar_url_unlock.tpl
+++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben in unsere Surfbar aufgenommen.
 
diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl
index dca1f94bdc..621562246f 100644
--- a/templates/de/emails/member/member_transfer_recipient.tpl
+++ b/templates/de/emails/member/member_transfer_recipient.tpl
@@ -1,10 +1,10 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine {?POINTS?}-&Uuml;berweisung von einem unserer Mitglieder erhalten!
 
 Hier sind nochmals alle Transaktionsdaten:
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl
index 713ee0b7d2..84bb3cc9ee 100644
--- a/templates/de/emails/member/member_transfer_sender.tpl
+++ b/templates/de/emails/member/member_transfer_sender.tpl
@@ -1,10 +1,10 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine {?POINTS?}-&Uuml;berweisung an eines unserer Mitglieder abgeschlossen!
 
 Hier sind nochmals alle Transaktionsdaten:
 ------------------------------
-Ihr Mitglieder-Id ist: $UID
+Ihr Mitglieder-Id ist: $userid
 ------------------------------
 --  Daten des Empfaengers:  --
 ------------------------------
diff --git a/templates/de/emails/member/member_wernis_accepted.tpl b/templates/de/emails/member/member_wernis_accepted.tpl
index 2f798173de..21bb873487 100644
--- a/templates/de/emails/member/member_wernis_accepted.tpl
+++ b/templates/de/emails/member/member_wernis_accepted.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 
 Nachricht vom Admin:
diff --git a/templates/de/emails/member/member_wernis_rejected.tpl b/templates/de/emails/member/member_wernis_rejected.tpl
index 3086d8f049..69aeb9321c 100644
--- a/templates/de/emails/member/member_wernis_rejected.tpl
+++ b/templates/de/emails/member/member_wernis_rejected.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 
 Nachricht vom Admin:
diff --git a/templates/de/emails/member/member_wernis_request.tpl b/templates/de/emails/member/member_wernis_request.tpl
index 80d24fb599..58ae5f913e 100644
--- a/templates/de/emails/member/member_wernis_request.tpl
+++ b/templates/de/emails/member/member_wernis_request.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
 Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
-Ihre Mitglied-Id lautet: $UID
+Ihre Mitglied-Id lautet: $userid
 ------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 ------------------------------
 Auszahlungshoehe: $content[payout]
 An Konto: $content[account]
diff --git a/templates/de/emails/new-pass.tpl b/templates/de/emails/new-pass.tpl
index 75f23bd5da..10492e0669 100644
--- a/templates/de/emails/new-pass.tpl
+++ b/templates/de/emails/new-pass.tpl
@@ -1,15 +1,15 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie oder ein anderes Mitglied haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
 
 ------------------------------------
-Ihre Login-Id lautet: $UID / Nickname: $content[nickname]
+Ihre Login-Id lautet: $userid / Nickname: $content[nickname]
 Neues Passwort: $content[new_pass]
 Sie k&ouml;nnen sich nun hier einloggen:: {?URL?}/login.php
 ------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------
 
 Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
diff --git a/templates/de/emails/newsletter.tpl b/templates/de/emails/newsletter.tpl
index ae602f9985..e775fa7f17 100644
--- a/templates/de/emails/newsletter.tpl
+++ b/templates/de/emails/newsletter.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
-Ihre Mitglieder-Id bei uns: $UID
+Ihre Mitglieder-Id bei uns: $userid
 --------------
 
 Sie erhalten diesen Newsletter von uns, weil Sie Mitglied bei unserem {?mt_word?}-Dienst {?MAIN_TITLE?} ({?URL?}) sind. Dies ist somit kein Spam! Eine Abmeldem&ouml;glichkeit finden Sie am Ende dieses Newsletters.
diff --git a/templates/de/emails/newsletter_html.tpl b/templates/de/emails/newsletter_html.tpl
index 1fb458bd33..0119325531 100644
--- a/templates/de/emails/newsletter_html.tpl
+++ b/templates/de/emails/newsletter_html.tpl
@@ -1,7 +1,7 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
-Ihre Mitglieder-Id bei uns: $UID
+Ihre Mitglieder-Id bei uns: $userid
 --------------
 
 Sie erhalten diesen Newsletter von uns, weil Sie Mitglied bei unserem {?mt_word?}-Dienst {?MAIN_TITLE?} ({?URL?}) sind. Dies ist somit kein Spam! Eine Abmeldem&ouml;glichkeit finden Sie am Ende dieses Newsletters.
diff --git a/templates/de/emails/normal-mail.tpl b/templates/de/emails/normal-mail.tpl
index c76e9b04f7..caf7210023 100644
--- a/templates/de/emails/normal-mail.tpl
+++ b/templates/de/emails/normal-mail.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname], $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%}, {%user,family=$userid%},
 
 Hier kommt eine weitere Mail von einem unserer Mitglieder zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
@@ -20,7 +20,7 @@ Beworbene URL: $content[url]
 Hinweis: Angesammelte {?POINTS?} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {?MAIN_TITLE?} Mitglied sein oder werden.
 
 Um Ihre $content[points] {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{?URL?}/mailid.php?userid=$UID&mailid=$content[id]
+{?URL?}/mailid.php?userid=$userid&mailid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
diff --git a/templates/de/emails/order-accept.tpl b/templates/de/emails/order-accept.tpl
index 82df0c10d9..31adb6781c 100644
--- a/templates/de/emails/order-accept.tpl
+++ b/templates/de/emails/order-accept.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
diff --git a/templates/de/emails/order-admin.tpl b/templates/de/emails/order-admin.tpl
index 5af50c7e37..e960cc6935 100644
--- a/templates/de/emails/order-admin.tpl
+++ b/templates/de/emails/order-admin.tpl
@@ -6,18 +6,18 @@ Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in {?max_send
 
 Hier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung:
 ------------------------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
-Email-Adresse: $content[email]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
+Email-Adresse: {%user,email=$userid%}
 Gebuchte Kategorie: $content[category]
 Gebuchter Payment-Typ: $content[payment]
 Betreffzeile in den Mails: $content[subject]
 Gebuchte URL: $content[url]
 ------------------------------------
-IP-Nummer: $REMOTE_ADDR
+IP-Nummer: {%server,remote_addr%}
 ------------------------------------
-Browser: $HTTP_USER_AGENT
+Browser: {%server,user_agent%}
 ------------------------------------------------
 
 Werbetext:
diff --git a/templates/de/emails/order-deleted.tpl b/templates/de/emails/order-deleted.tpl
index f633838fcc..dde7ca66fd 100644
--- a/templates/de/emails/order-deleted.tpl
+++ b/templates/de/emails/order-deleted.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung gel&ouml;scht. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
diff --git a/templates/de/emails/order-member.tpl b/templates/de/emails/order-member.tpl
index 1b3788c6e3..93980bc89e 100644
--- a/templates/de/emails/order-member.tpl
+++ b/templates/de/emails/order-member.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!
 
diff --git a/templates/de/emails/order-reject.tpl b/templates/de/emails/order-reject.tpl
index 0fbdf147a3..9ec743f910 100644
--- a/templates/de/emails/order-reject.tpl
+++ b/templates/de/emails/order-reject.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung abgelehnt. Bite beachten Sie unsere AGBs! Bei weiteren Verstoessen gegen unsere AGBs werden wir Ihre URL und ggf. auch Ihren Account sperren. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
diff --git a/templates/de/emails/profile-updte.tpl b/templates/de/emails/profile-updte.tpl
index 62e31e2d98..4ec6298fd3 100644
--- a/templates/de/emails/profile-updte.tpl
+++ b/templates/de/emails/profile-updte.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Haben Sie Neuigkeiten f&uuml;r uns?
 
@@ -7,7 +7,7 @@ Sie hatten sich vor laengerer Zeit zu unserem {?mt_word?}-Service {?MAIN_TITLE?}
 Bitte loggen Sie sich zu unserem {?mt_word?}-System ein und aktualisieren Sie Ihre Daten!
 
 ------------------
-Ihre Mitglieder-Id war: $UID
+Ihre Mitglieder-Id war: $userid
 ------------------
 Angemeldet seit: $content[joined]
 ------------------
diff --git a/templates/de/emails/register-admin.tpl b/templates/de/emails/register-admin.tpl
index 38918c558e..c5ffa7ff65 100644
--- a/templates/de/emails/register-admin.tpl
+++ b/templates/de/emails/register-admin.tpl
@@ -4,18 +4,19 @@ Ein Gast hat sich soeben bei uns angemeldet.
 
 Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten:
 -------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
 Stra&szlig;e und Hausnummer: $content[street]
 L&auml;ndercode: $content[country]
-Postleitzahl: $content[zip]
-Wohnort: $content[city]
-Email-Adresse: $content[email]
+Postleitzahl: {%user,zip=$userid%}
+Wohnort: {%user,city=$userid%}
+Email-Adresse: {%user,email=$userid%}
 Geburtsdatum: $content[birthday]
 -------------------------
-IP-Nummer: $REMOTE_ADDR
-Browser: $HTTP_USER_AGENT
+IP-Nummer: {%server,remote_addr%}
+-------------------------
+Browser: {%server,user_agent%}
 -------------------------
 Geworben von: $content[refid]
 -------------------------
diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl
index 288cae1e15..729959bbe3 100644
--- a/templates/de/emails/register-member.tpl
+++ b/templates/de/emails/register-member.tpl
@@ -1,17 +1,17 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 vielen Dank, dass Sie sich f&uuml;r unseren {?mt_word?} entschieden haben! Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
 Hier sind nochmals zur &Uuml;berpr&uuml;fung Ihre pers&ouml;nlichen Daten:
 -----------------------------------------------
-Anrede: $content[gender]
-Vorname: $content[surname]
-Nachname: $content[family]
+Anrede: {%user,gender,translateGender=$userid%}
+Vorname: {%user,surname=$userid%}
+Nachname: {%user,family=$userid%}
 Stra&szlig;e und Hausnummer: $content[street]
 L&auml;ndercode: $content[country]
-Postleitzahl: $content[zip]
-Wohnort: $content[city]
-Email-Adresse: $content[email]
+Postleitzahl: {%user,zip=$userid%}
+Wohnort: {%user,city=$userid%}
+Email-Adresse: {%user,email=$userid%}
 Geburtsdatum: $content[birthday]
 -----------------------------------------------
 Ihr Passwort: $content[pass]
diff --git a/templates/de/emails/sub-points.tpl b/templates/de/emails/sub-points.tpl
index 3531837576..8db1d81f29 100644
--- a/templates/de/emails/sub-points.tpl
+++ b/templates/de/emails/sub-points.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} abgezogen!
 
diff --git a/templates/de/emails/unlock-user.tpl b/templates/de/emails/unlock-user.tpl
index ec1d40e618..a25d05efc0 100644
--- a/templates/de/emails/unlock-user.tpl
+++ b/templates/de/emails/unlock-user.tpl
@@ -1,13 +1,13 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie k&ouml;nnen sich nun wieder unter folgender URL einloggen:
 
 ---------------------------
-Mitglieder-Id : $UID
+Mitglieder-Id : $userid
 Adresse : {?URL?}/login.php
 ---------------------------
 
-Sollten Sie Ihr Passwort vergessen haben, geben Sie bitte unten die Mitglieder-Id $UID und die Email-Adresse ein, an der diese Mail geschickt wurde.
+Sollten Sie Ihr Passwort vergessen haben, geben Sie bitte unten die Mitglieder-Id $userid und die Email-Adresse ein, an der diese Mail geschickt wurde.
 
 Nachricht vom Admin:
 ---------------------------
diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl
index 0f5303bd2e..a831ea3b1b 100644
--- a/templates/de/html/admin/admin_list_beg_rows.tpl
+++ b/templates/de/html/admin/admin_list_beg_rows.tpl
@@ -1,11 +1,7 @@
 <tr>
 	<td class="switch_sw$content[sw] bottom right" align="center">$content[win1]$content[cnt]$content[win2]</td>
-	<td class="switch_sw$content[sw] bottom right" align="center">$content[win1]<a
-		href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[win2]</td>
-	<td class="switch_sw$content[sw] bottom right">&nbsp;$content[win1]<a
-		href="$content[email]">$content[gender] $content[surname]
-	$content[family]</a>$content[win2]</td>
-	<td class="switch_sw$content[sw] bottom right">&nbsp;$content[turbo]
-	{?POINTS?}</td>
+	<td class="switch_sw$content[sw] bottom right" align="center">$content[win1]<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[win2]</td>
+	<td class="switch_sw$content[sw] bottom right">&nbsp;$content[win1]<a href="$content[email]">$content[gender] $content[surname] $content[family]</a>$content[win2]</td>
+	<td class="switch_sw$content[sw] bottom right">&nbsp;$content[turbo] {?POINTS?}</td>
 	<td class="switch_sw$content[sw] bottom">&nbsp;$content[last_online]</td>
-</tr>
\ No newline at end of file
+</tr>