X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=e76413f51297c87d844f411ff92819a0aff5eff5;hp=a141f3009a907bc2e0cbd3e6180508b89802c91f;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=4cc62618b7a59c6641b057c34047b2dd531c16ad

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index a141f3009a..e76413f512 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,19 +43,24 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
+// Extension ext-transfer must be avtive
 if ((!isExtensionActive('transfer')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('transfer'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=transfer%}');
 	return;
 } // END - if
 
 // Check for mode in GET
 $mode = '';
-if (isGetRequestParameterSet('mode')) $mode = getRequestParameter('mode');
+if (isGetRequestParameterSet('mode')) {
+	$mode = getRequestParameter('mode');
+} // END - if
 
 // Check for "faker"
-if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
+if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) {
+	$mode = '';
+} // END - if
 
 switch ($mode) {
 	case 'new': // Start new transfer
@@ -69,9 +72,9 @@ switch ($mode) {
 
 		if (isFormSent()) {
 			// Add new transfer
-			if (getConfig('transfer_code') > 0) {
+			if (getTransferCode() > 0) {
 				// Check for code
-				$code = generateRandomCode(getConfig('transfer_code'), postRequestParameter('code_chk'), getMemberId(), $content['max_transferable']);
+				$code = generateRandomCode(getTransferCode(), postRequestParameter('code_chk'), getMemberId(), $content['max_transferable']);
 				$valid_code = ($code == postRequestParameter('code'));
 			} else {
 				// Zero length (= disabled) is always valid!
@@ -90,15 +93,8 @@ switch ($mode) {
 			// Test if a recipient is selected
 			$valid_recipient = isValidUserId(postRequestParameter('to_userid'));
 
-			// Check for nickname extension and set additional data
-			// @TODO Rewrite this to a filter
-			$add = '';
-			if (isExtensionActive('nickname')) {
-				$add = ', `nickname`';
-			} // END - if
-
 			// Re-check receivers and own personal data
-			$result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
+			$result = SQL_QUERY_ESC("SELECT `userid`,`gender`,`surname`,`family`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
 				array(
 					getMemberId(),
 					bigintval(postRequestParameter('to_userid'))
@@ -125,7 +121,7 @@ switch ($mode) {
 				$TEST_NICK_REC    = $content['recipient']['nickname'];
 
 				// Default is userids for subject line
-				$SENDER = getMemberId();
+				$SENDER    = getMemberId();
 				$RECIPIENT = bigintval(postRequestParameter('to_userid'));
 
 				// If nickname is installed we can set the nickname
@@ -133,69 +129,81 @@ switch ($mode) {
 				if (isExtensionActive('nickname')) {
 					if (($TEST_NICK_SENDER != getMemberId()) && (!empty($TEST_NICK_SENDER))) {
 						$SENDER = $content['sender']['nickname'];
-					}
+					} // END - if
 
 					if (($TEST_NICK_REC != postRequestParameter('to_userid')) && (!empty($TEST_NICK_REC))) {
 						$RECIPIENT = $content['recipient']['nickname'];
-					}
+					} // END - if
 				} // END - if
 
-				// Remember transfer reason and fancy date/time in constants
-				$content['reason']  = secureString(postRequestParameter('reason'));
-				$content['expires'] = createFancyTime(getConfig('transfer_age'));
+				// Remember transfer reason
+				$content['reason']  = postRequestParameter('reason');
 
 				// Generate tranafer id
 				$content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestParameter('reason')));
 
 				// Add entries to both tables
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
-					array(bigintval(postRequestParameter('to_userid')), getMemberId(), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
-					array(getMemberId(), bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`,`from_userid`,`points`,`reason`,`time_trans`,`trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
+					array(
+						bigintval(postRequestParameter('to_userid')),
+						getMemberId(),
+						bigintval(postRequestParameter('points')),
+						postRequestParameter('reason'),
+						$content['trans_id']
+					), __FILE__, __LINE__);
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`,`to_userid`,`points`,`reason`,`time_trans`,`trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
+					array(
+						getMemberId(),
+						bigintval(postRequestParameter('to_userid')),
+						bigintval(postRequestParameter('points')),
+						postRequestParameter('reason'),
+						$content['trans_id']
+					), __FILE__, __LINE__);
 
 				// Add points to account *directly* ...
-				addPointsDirectly('member_transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
+				initReferalSystem();
+				addPointsThroughReferalSystem('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
 
-				// ... and add it to current user's used points
+				// ... and add it to current user's used points and ignore return status
 				subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
 
 				// First send email to recipient
 				$message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
-				sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJECT--}' . ': ' . $SENDER, $message);
+				sendEmail($content['recipient']['userid'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJECT--}' . ': ' . $SENDER, $message);
 
 				// Second send email to sender
 				$message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());
-				sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message);
+				sendEmail($content['sender']['userid'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message);
 
 				// At last send admin mail(s)
 				$adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT);
 				sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
 				// Transfer is completed
-				loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '<br /><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a>');
+				displayMessage('<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
 			} elseif ($valid_code === false) {
 				// Invalid Touring code!
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_CODE--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
 				unsetPostRequestParameter('ok');
 			} elseif ($valid_pass === false) {
 				// Wrong password entered
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_PASSWORD--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}');
 				unsetPostRequestParameter('ok');
 			} elseif ($valid_amount === false) {
 				// Too much points entered
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_POINTS--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}');
 				unsetPostRequestParameter('ok');
 			} elseif ($valid_reason === false) {
 				// No transfer reason entered
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_REASON--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}');
 				unsetPostRequestParameter('ok');
 			} elseif ($valid_recipient === false) {
 				// No recipient selected
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_RECIPIENT--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}');
 				unsetPostRequestParameter('ok');
 			} elseif ($valid_data === false) {
 				// No recipient/sender selected
-				loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_DATA--}</div>');
+				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}');
 				unsetPostRequestParameter('ok');
 			}
 
@@ -205,34 +213,20 @@ switch ($mode) {
 
 		if (!isFormSent()) {
 			// Load member list
-			if (isExtensionActive('nickname')) {
-				// Load userid and nickname
-				$result = SQL_QUERY_ESC("SELECT `userid`, `nickname` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
-					array(getMemberId()), __FILE__, __LINE__);
-			} else {
-				// Load only userid
-				$result = SQL_QUERY_ESC("SELECT `userid`, `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
-					array(getMemberId()), __FILE__, __LINE__);
-			}
+			$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
+				array(getMemberId()), __FILE__, __LINE__);
 
 			if (!SQL_HASZERONUMS($result)) {
 				// Load list
-				$OUT  = '<select name="to_userid" size="1" class="member_select">
+				$OUT  = '<select name="to_userid" size="1" class="form_select">
 	<option value="0">{--SELECT_NONE--}</option>';
-				// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
-				while (list($userid, $nick) = SQL_FETCHROW($result)) {
+				while (list($userid) = SQL_FETCHROW($result)) {
 					$OUT .= '	<option value="' . $userid . '"';
-					if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
-					$OUT .= '>';
-					if (($nick != $userid) && (!empty($nick))) {
-						// Output nickname
-						$OUT .= $nick;
-					} else {
-						// Output userid
-						$OUT .= $userid;
-					}
-					$OUT .= '</option>';
-				}
+					if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) {
+						$OUT .= ' selected="selected"';
+					} // END - if
+					$OUT .= '>' . $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})</option>';
+				} // END - while
 				$OUT .= '</select>';
 				$content['to_disabled'] = '';
 
@@ -240,7 +234,7 @@ switch ($mode) {
 				SQL_FREERESULT($result);
 			} else {
 				// No one else is opt-in
-				$OUT = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_ONE_ELSE_OPT_IN--}');
+				$OUT = displayMessage('{--TRANSFER_NO_ONE_ELSE_OPT_IN--}', true);
 				$content['to_disabled'] = ' disabled="disabled"';
 			}
 
@@ -248,14 +242,21 @@ switch ($mode) {
 			$content['userid_selection'] = $OUT;
 
 			// Generate Code
-			if (getConfig('transfer_code') > 0) {
+			if (getTransferCode() > 0) {
+				// Generate random number
 				$rand = mt_rand(0, 99999);
-				$code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']);
+
+				// Generate CAPTCHA code
+				$code = generateRandomCode(getTransferCode(), $rand, getMemberId(), $content['max_transferable']);
+
+				// Generate image (HTML code)
 				$img = generateImageOrCode($code, false);
-				$content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="member_normal" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
+
+				// Add all and hidden field
+				$content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
 			} else {
 				$code = '00000';
-				$content['captcha_code'] = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_CODE--}');
+				$content['captcha_code'] = displayMessage('{--TRANSFER_NO_CODE--}', true);
 			}
 
 			// Init points/reason
@@ -280,14 +281,14 @@ switch ($mode) {
 		$nothingMessage = '';
 		switch ($mode) {
 			case 'list_in':
-				$sql = "SELECT `trans_id`, `from_userid` AS party_userid, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}";
+				$sql = 'SELECT `trans_id`,`from_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
 				$nothingMessage     = '{--TRANSFER_NO_INCOMING_TRANSFERS--}';
 				$content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}';
 				$content['title']   = '{--TRANSFER_LIST_INCOMING--}';
 				break;
 
 			case 'list_out':
-				$sql = "SELECT `trans_id`, `to_userid` AS party_userid, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}";
+				$sql = 'SELECT `trans_id`,`to_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
 				$nothingMessage     = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}';
 				$content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}';
 				$content['title']   = '{--TRANSFER_LIST_OUTGOING--}';
@@ -301,26 +302,20 @@ switch ($mode) {
 		// Do we have entries?
 		if (!SQL_HASZERONUMS($result)) {
 			$OUT = '';
-			// @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
-			while (list($tid, $userid, $points, $reason, $stamp) = SQL_FETCHROW($result)) {
-				// Rewrite points
-				if ($type == 'OUT') $points = $points . '-';
+			while ($content = SQL_FETCHARRAY($result)) {
+				// Rewrite points, out is subtracted
+				if ($type == 'OUT') {
+					$content['points'] = $content['points'] * -1;
+				} // END - if
 
 				// Prepare content for template
-				// @TODO Rewrite: tid->trans_id,stamp->time_trans
-				$row = array(
-					'trans_id' => $tid,
-					'stamp'    => generateDateTime($stamp, 3),
-					'userid'   => $userid,
-					'reason'   => $reason,
-					'points'   => $points
-				);
+				$$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
 				// Load row template
-				$OUT .= loadTemplate('member_transfer_row2', true, $row);
+				$OUT .= loadTemplate('member_transfer_row2', true, $content);
 
 				// Add points and switch color
-				$totalPoints += $points;
+				$totalPoints += $content['points'];
 			} // END - while
 
 			// Free memory
@@ -329,7 +324,7 @@ switch ($mode) {
 			// Nothing for in or out
 			$OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
-    ' . loadTemplate('admin_settings_saved', true, $nothingMessage) . '
+    ' . displayMessage($nothingMessage, true) . '
   </td>
 </tr>';
 		}
@@ -338,67 +333,70 @@ switch ($mode) {
 		$content['rows'] = $OUT;
 
 		// Remeber total amount
-		$content['total'] = translateComma($totalPoints);
+		$content['total_points'] = $totalPoints;
 
 		// Load final template
 		loadTemplate('member_transfer_list', false, $content);
 		break;
 
 	case 'list_all': // List all transactions
-		// We fill a temporary table with data from both tables. This is much easier
-		// to code and unstand by you as sub-SELECT queries. I know this is not the
-		// fastest way but it shall be fine for now.
-		//
-		// First of all create the temporary table
-		$result = SQL_QUERY("CREATE TEMPORARY TABLE `{?_MYSQL_PREFIX?}_transfers_tmp` (
+		/*
+		 * Fill a temporary table with data from both tables. This is much
+		 * easier to code and unstandable by you as sub-SELECT queries. I know
+		 * this is not the fastest way but it shall be fine for now.
+		 */
+
+		// First of all create the per-user temporary table
+		$result = SQL_QUERY_ESC("CREATE TEMPORARY TABLE `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (
 `trans_id` VARCHAR(12) NOT NULL DEFAULT '',
 `party_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `reason` VARCHAR(255) NOT NULL DEFAULT '',
 `time_trans` VARCHAR(10) NOT NULL DEFAULT 0,
 `trans_type` ENUM('IN','OUT') NOT NULL DEFAULT 'IN',
-KEY (`party_userid`)
-) TYPE=HEAP", __FILE__, __LINE__);
+INDEX (`party_userid`)
+) ENGINE = HEAP COMMENT = 'Temporary transfer table'", array(getMemberId()), __FILE__, __LINE__);
 
 		// Let's begin with the incoming list
-		$result = SQL_QUERY_ESC("SELECT `trans_id`, `from_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}",
+		$result = SQL_QUERY_ESC("SELECT `trans_id`,`from_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}",
 			array(getMemberId()), __FILE__, __LINE__);
 		while ($DATA = SQL_FETCHROW($result)) {
 			$DATA[] = 'IN';
 			$DATA = implode("','", $DATA);
-			$res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $DATA . "')", __FILE__, __LINE__);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $DATA . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// As the last table transfer data from outgoing table to temporary
-		$result = SQL_QUERY_ESC("SELECT `trans_id`, `to_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
+		$result = SQL_QUERY_ESC("SELECT `trans_id`,`to_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
 			array(getMemberId()), __FILE__, __LINE__);
 		while ($DATA = SQL_FETCHROW($result)) {
 			$DATA[] = 'OUT';
 			$DATA = implode("','", $DATA);
-			$res_temp = SQL_QUERY("INSERT INTO `{?_MYSQL_PREFIX?}_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $DATA . "')", __FILE__, __LINE__);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $DATA . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
+		// Search for entries
+		$result = SQL_QUERY_ESC("SELECT `party_userid`,`trans_id`,`points`,`reason`,`time_trans`,`trans_type` FROM `{?_MYSQL_PREFIX?}_%s_transfers_tmp` ORDER BY `time_trans` DESC",
+			array(getMemberId()), __FILE__, __LINE__);
+
 		$total = '0';
 		if (!SQL_HASZERONUMS($result)) {
-			// Search for entries
-			$result = SQL_QUERY("SELECT `party_userid`, `trans_id`, `points`, `reason`, `time_trans`, `trans_type` FROM `{?_MYSQL_PREFIX?}_transfers_tmp` ORDER BY `time_trans` DESC",
-				__FILE__, __LINE__);
-
 			// Output rows
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
-				// Rewrite points
-				if ($content['trans_type'] == 'OUT') $content['points'] = '-'.$content['points']."";
+				// Rewrite points if OUT
+				if ($content['trans_type'] == 'OUT') {
+					$content['points'] = $content['points'] * -1;
+				} // END - if
 
 				// Prepare content for template
 				$content['time']   = generateDateTime($content['time_trans'], 3);
-				$content['points'] = translateComma($content['points']);
 
 				// Load row template
 				$OUT .= loadTemplate('member_transfer_row', true, $content);
@@ -406,23 +404,23 @@ KEY (`party_userid`)
 				// Add points and switch color
 				$total += $content['points'];
 			} // END - while
-
-			// Free memory
-			SQL_FREERESULT($result);
 		} else {
 			// Nothing for in and out
 			$OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
-    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '
   </td>
 </tr>';
 		}
 
+		// Free memory
+		SQL_FREERESULT($result);
+
 		// ... and add them to a constant for the template
 		$content['rows'] =  $OUT;
 
 		// Remeber total amount
-		$content['total'] = translateComma($total);
+		$content['total_points'] = $total;
 
 		// Set title
 		$content['title'] = '{--TRANSFER_LIST_ALL--}';
@@ -431,7 +429,7 @@ KEY (`party_userid`)
 		$content['balance'] = '{--TRANSFER_TOTAL_BALANCE--}';
 
 		// At the end we don't need a temporary table in memory
-		$result = SQL_QUERY("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_transfers_tmp`", __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_%s_transfers_tmp`", array(getMemberId()), __FILE__, __LINE__);
 
 		// Load final template
 		loadTemplate('member_transfer_list', false, $content);
@@ -442,27 +440,27 @@ KEY (`party_userid`)
 
 	default: // Overview page
 		// Check incoming transfers
-		$total = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
-		$content['in_link'] = $total;
-		if ($total > 0) {
-			$content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}">' . $total . '</a>';
+		$totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
+		$content['in_link'] = $totalIn;
+		if ($totalIn > 0) {
+			$content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}">' . $totalIn . '</a>';
 		} // END - if
 
 		// Check outgoing transfers
-		$dmy = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
-
-		// Add to total amount
-		$total += $dmy;
+		$totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
 
-		$content['out_link'] = $dmy;
-		if ($dmy > 0) {
-			$content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}">' . $dmy . '</a>';
+		$content['out_link'] = $totalOut;
+		if ($totalOut > 0) {
+			$content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}">' . $totalOut . '</a>';
 		} // END - if
 
+		// Add all to total amount
+		$total = $totalIn + $totalOut;
+
 		// Total transactions
 		$content['all_link'] = $total;
 		if ($total > 0) {
-			$content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}">' . $total . '</a>';
+			$content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
 		} // END - if
 
 		if (isFormSent()) {
@@ -471,7 +469,7 @@ KEY (`party_userid`)
 				array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
 
 			// "Settings saved..."
-			loadTemplate('admin_settings_saved', false, '<div class="member_done">{--SETTINGS_SAVED--}</div>');
+			displayMessage('{--SETTINGS_SAVED--}');
 		} // END - if
 
 		// Init entries
@@ -499,12 +497,12 @@ KEY (`party_userid`)
 FROM
 	`{?_MYSQL_PREFIX?}_user_transfers_out`
 WHERE
-	`time_trans` > (UNIX_TIMESTAMP() - %s) AND `userid`=%s
+	(UNIX_TIMESTAMP() - `time_trans`) >= {?transfer_timeout?} AND
+	`userid`=%s
 ORDER BY
 	`time_trans` DESC
 LIMIT 1",
 			array(
-				getConfig('transfer_timeout'),
 				getMemberId()
 			), __FILE__, __LINE__);
 
@@ -512,7 +510,7 @@ LIMIT 1",
 		if (SQL_NUMROWS($result) == 1) {
 			// Load newest transaction
 			list($newest) = SQL_FETCHROW($result);
-			$content['settings'] = getMaskedMessage('TRANSFER_LATEST_IS', generateDateTime($newest, 3));
+			$content['settings'] = '{%message,TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
 		} else {
 			// Load template
 			$content['settings'] = loadTemplate('member_transfer_settings', true, $content);