X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=a0ad05b9e784af090e70d591ee9dc5f8b9553fc4;hb=b4784eb7267921f162d2fa90d21fa20fad700962;hp=cf59a6ec085b1d732f7878ac92bb44136dfd5e51;hpb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;p=mailer.git

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index cf59a6ec08..a0ad05b9e7 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -45,15 +45,16 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 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 (isGetRequestElementSet('do')) {
+	$mode = getRequestElement('do');
 } // END - if
 
 // Check for "faker"
@@ -71,42 +72,35 @@ 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']);
-				$valid_code = ($code == postRequestParameter('code'));
+				$code = generateRandomCode(getTransferCode(), postRequestElement('code_chk'), getMemberId(), $content['max_transferable']);
+				$valid_code = ($code == postRequestElement('code'));
 			} else {
 				// Zero length (= disabled) is always valid!
-				$valid_code = true;
+				$valid_code = TRUE;
 			}
 
 			// Test password
-			$valid_pass = ($pass == generateHash(postRequestParameter('password'), $pass));
+			$valid_pass = ($pass == generateHash(postRequestElement('password'), $pass));
 
 			// Test transfer amount
-			$valid_amount = ((isPostRequestParameterSet('points')) && (postRequestParameter('points') <= $content['max_transferable']));
+			$valid_amount = ((isPostRequestElementSet('points')) && (postRequestElement('points') <= $content['max_transferable']));
 
 			// Test reason for transfer
-			$valid_reason = (isPostRequestParameterSet('reason'));
+			$valid_reason = (isPostRequestElementSet('reason'));
 
 			// 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
+			$valid_recipient = isValidUserId(postRequestElement('to_userid'));
 
 			// 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'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2",
 				array(
 					getMemberId(),
-					bigintval(postRequestParameter('to_userid'))
+					bigintval(postRequestElement('to_userid'))
 				), __FILE__, __LINE__);
 
-			// Do we have two entries?
+			// Is there two entries?
 			$valid_data = (SQL_NUMROWS($result) == 2);
 
 			// Final check if all is fine
@@ -128,7 +122,7 @@ switch ($mode) {
 
 				// Default is userids for subject line
 				$SENDER    = getMemberId();
-				$RECIPIENT = bigintval(postRequestParameter('to_userid'));
+				$RECIPIENT = bigintval(postRequestElement('to_userid'));
 
 				// If nickname is installed we can set the nickname
 				// @TODO Rewrite this to a filter
@@ -137,68 +131,80 @@ switch ($mode) {
 						$SENDER = $content['sender']['nickname'];
 					} // END - if
 
-					if (($TEST_NICK_REC != postRequestParameter('to_userid')) && (!empty($TEST_NICK_REC))) {
+					if (($TEST_NICK_REC != postRequestElement('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'] = '{%config,createFancyTime=transfer_age%}';
+				// Remember transfer reason
+				$content['reason']  = postRequestElement('reason');
 
 				// Generate tranafer id
-				$content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestParameter('reason')));
+				$content['trans_id'] = bigintval(generateRandomCode('10', getRandomTan(), getMemberId(), postRequestElement('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__);
+					array(
+						bigintval(postRequestElement('to_userid')),
+						getMemberId(),
+						bigintval(postRequestElement('points')),
+						postRequestElement('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__);
+					array(
+						getMemberId(),
+						bigintval(postRequestElement('to_userid')),
+						bigintval(postRequestElement('points')),
+						postRequestElement('reason'),
+						$content['trans_id']
+					), __FILE__, __LINE__);
 
 				// Add points to account *directly* ...
-				addPointsDirectly('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
+				initReferralSystem();
+				addPointsThroughReferralSystem('transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
 
-				// ... and add it to current user's used points
-				subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
+				// ... and add it to current user's used points and ignore return status
+				subtractPoints('transfer', getMemberId(), postRequestElement('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);
+				$message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid'));
+				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);
+				$adminSubject = sprintf("%s (%s->%s)", '{--ADMIN_TRANSFER_SUBJECT--}', $SENDER, $RECIPIENT);
 				sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
 				// Transfer is completed
-				loadTemplate('admin_settings_saved', false, '<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
-			} elseif ($valid_code === false) {
+				displayMessage('<div>{--MEMBER_TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--MEMBER_TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
+			} elseif ($valid_code === FALSE) {
 				// Invalid Touring code!
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
-				unsetPostRequestParameter('ok');
-			} elseif ($valid_pass === false) {
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_CODE--}');
+				unsetPostRequestElement('ok');
+			} elseif ($valid_pass === FALSE) {
 				// Wrong password entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}');
-				unsetPostRequestParameter('ok');
-			} elseif ($valid_amount === false) {
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_PASSWORD--}');
+				unsetPostRequestElement('ok');
+			} elseif ($valid_amount === FALSE) {
 				// Too much points entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}');
-				unsetPostRequestParameter('ok');
-			} elseif ($valid_reason === false) {
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_POINTS--}');
+				unsetPostRequestElement('ok');
+			} elseif ($valid_reason === FALSE) {
 				// No transfer reason entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}');
-				unsetPostRequestParameter('ok');
-			} elseif ($valid_recipient === false) {
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_REASON--}');
+				unsetPostRequestElement('ok');
+			} elseif ($valid_recipient === FALSE) {
 				// No recipient selected
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}');
-				unsetPostRequestParameter('ok');
-			} elseif ($valid_data === false) {
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_RECIPIENT--}');
+				unsetPostRequestElement('ok');
+			} elseif ($valid_data === FALSE) {
 				// No recipient/sender selected
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}');
-				unsetPostRequestParameter('ok');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_DATA--}');
+				unsetPostRequestElement('ok');
 			}
 
 			// Free result
@@ -207,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'" . runFilterChain('user_exclusion_sql', ' ') . " 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="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 ((isPostRequestElementSet('to_userid')) && (postRequestElement('to_userid') == $userid)) {
+						$OUT .= ' selected="selected"';
+					} // END - if
+					$OUT .= '>{%template,DisplayUsername=' . $userid . '%}</option>';
+				} // END - while
 				$OUT .= '</select>';
 				$content['to_disabled'] = '';
 
@@ -242,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('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', TRUE);
 				$content['to_disabled'] = ' disabled="disabled"';
 			}
 
@@ -250,21 +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);
+				$rand = getRandomTan();
 
 				// Generate CAPTCHA code
-				$code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']);
+				$code = generateRandomCode(getTransferCode(), $rand, getMemberId(), $content['max_transferable']);
 
 				// Generate image (HTML code)
-				$img = generateImageOrCode($code, false);
+				$img = generateImageOrCode($code, FALSE);
 
 				// 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('{--MEMBER_TRANSFER_NO_CODE--}', TRUE);
 			}
 
 			// Init points/reason
@@ -272,14 +264,14 @@ switch ($mode) {
 			$content['reason'] = '';
 
 			// Transfer maybe already entered valued'
-			if (isPostRequestParameterSet('ok')) {
+			if (isPostRequestElementSet('ok')) {
 				// Get values from form
-				$content['points'] = postRequestParameter('points');
-				$content['reason'] = postRequestParameter('reason');
+				$content['points'] = postRequestElement('points');
+				$content['reason'] = postRequestElement('reason');
 			} // END - if
 
 			// Output form
-			loadTemplate('member_transfer_new', false, $content);
+			loadTemplate('member_transfer_new', FALSE, $content);
 		} // END - if
 		break;
 
@@ -289,17 +281,17 @@ 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?}";
-				$nothingMessage     = '{--TRANSFER_NO_INCOMING_TRANSFERS--}';
-				$content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}';
-				$content['title']   = '{--TRANSFER_LIST_INCOMING--}';
+				$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     = '{--MEMBER_TRANSFER_NO_INCOMING_TRANSFERS--}';
+				$content['balance'] = '{--MEMBER_TRANSFER_TOTAL_INCOMING--}';
+				$content['title']   = '{--MEMBER_LIST_INCOMING_TRANSFER_TITLE--}';
 				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?}";
-				$nothingMessage     = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}';
+				$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     = '{--MEMBER_TRANSFER_NO_OUTGOING_TRANSFERS--}';
 				$content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}';
-				$content['title']   = '{--TRANSFER_LIST_OUTGOING--}';
+				$content['title']   = '{--MEMBER_LIST_OUTGOING_TRANSFER_TITLE--}';
 				break;
 		} // END - switch
 
@@ -307,7 +299,7 @@ switch ($mode) {
 		$totalPoints = '0';
 		$result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);
 
-		// Do we have entries?
+		// Are there entries?
 		if (!SQL_HASZERONUMS($result)) {
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
@@ -320,7 +312,7 @@ switch ($mode) {
 				$$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
 				// Load row template
-				$OUT .= loadTemplate('member_transfer_row2', true, $content);
+				$OUT .= loadTemplate('member_transfer_row2', TRUE, $content);
 
 				// Add points and switch color
 				$totalPoints += $content['points'];
@@ -332,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>';
 		}
@@ -341,10 +333,10 @@ switch ($mode) {
 		$content['rows'] = $OUT;
 
 		// Remeber total amount
-		$content['total'] = $totalPoints;
+		$content['total_points'] = $totalPoints;
 
 		// Load final template
-		loadTemplate('member_transfer_list', false, $content);
+		loadTemplate('member_transfer_list', FALSE, $content);
 		break;
 
 	case 'list_all': // List all transactions
@@ -362,16 +354,16 @@ switch ($mode) {
 `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", array(getMemberId()), __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?}",
 			array(getMemberId()), __FILE__, __LINE__);
-		while ($DATA = SQL_FETCHROW($result)) {
-			$DATA[] = 'IN';
-			$DATA = implode("','", $DATA);
-			$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__);
+		while ($content = SQL_FETCHROW($result)) {
+			array_push($content, 'IN');
+			$content = implode("','", $content);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
@@ -380,10 +372,10 @@ KEY (`party_userid`)
 		// 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?}",
 			array(getMemberId()), __FILE__, __LINE__);
-		while ($DATA = SQL_FETCHROW($result)) {
-			$DATA[] = 'OUT';
-			$DATA = implode("','", $DATA);
-			$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__);
+		while ($content = SQL_FETCHROW($result)) {
+			array_push($content, 'OUT');
+			$content = implode("','", $content);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
@@ -407,7 +399,7 @@ KEY (`party_userid`)
 				$content['time']   = generateDateTime($content['time_trans'], 3);
 
 				// Load row template
-				$OUT .= loadTemplate('member_transfer_row', true, $content);
+				$OUT .= loadTemplate('member_transfer_row', TRUE, $content);
 
 				// Add points and switch color
 				$total += $content['points'];
@@ -416,7 +408,7 @@ KEY (`party_userid`)
 			// 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>';
 		}
@@ -428,7 +420,7 @@ KEY (`party_userid`)
 		$content['rows'] =  $OUT;
 
 		// Remeber total amount
-		$content['total'] = $total;
+		$content['total_points'] = $total;
 
 		// Set title
 		$content['title'] = '{--TRANSFER_LIST_ALL--}';
@@ -440,7 +432,7 @@ KEY (`party_userid`)
 		$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);
+		loadTemplate('member_transfer_list', FALSE, $content);
 
 		// Free some memory...
 		SQL_FREERESULT($result);
@@ -448,18 +440,18 @@ KEY (`party_userid`)
 
 	default: // Overview page
 		// Check incoming transfers
-		$totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
+		$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>';
+			$content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
 		} // END - if
 
 		// Check outgoing transfers
-		$totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
+		$totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', TRUE);
 
 		$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>';
+			$content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_out%}">' . $totalOut . '</a>';
 		} // END - if
 
 		// Add all to total amount
@@ -468,16 +460,16 @@ KEY (`party_userid`)
 		// 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%}">{%pipe,translateComma=' . $total . '%}</a>';
+			$content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
 		} // END - if
 
 		if (isFormSent()) {
 			// Save settings
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",
-				array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
+				array(postRequestElement('opt_in'), getMemberId()), __FILE__, __LINE__);
 
 			// "Settings saved..."
-			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+			displayMessage('{--SETTINGS_SAVED--}');
 		} // END - if
 
 		// Init entries
@@ -491,11 +483,11 @@ KEY (`party_userid`)
 		// Set 'new transfer' link according to above option
 		switch (getUserData('opt_in')) {
 			case 'Y':
-				$content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
+				$content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" title="{--MEMBER_TRANSFER_NOW_LINK_TITLE--}">{--MEMBER_TRANSFER_NOW_LINK--}</a>';
 				break;
 
 			case 'N':
-				$content['new_link'] = '{--TRANSFER_PLEASE_ALLOW_OPT_IN--}';
+				$content['new_link'] = '{--MEMBER_PLEASE_ALLOW_TRANSFER_RECEIVE--}';
 				break;
 		} // END - switch
 
@@ -505,7 +497,7 @@ KEY (`party_userid`)
 FROM
 	`{?_MYSQL_PREFIX?}_user_transfers_out`
 WHERE
-	`time_trans` > (UNIX_TIMESTAMP() - {?transfer_timeout?}) AND
+	(UNIX_TIMESTAMP() - `time_trans`) >= {?transfer_timeout?} AND
 	`userid`=%s
 ORDER BY
 	`time_trans` DESC
@@ -514,21 +506,21 @@ LIMIT 1",
 				getMemberId()
 			), __FILE__, __LINE__);
 
-		// Do we have an entry?
+		// Is there an entry?
 		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,MEMBER_TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
 		} else {
 			// Load template
-			$content['settings'] = loadTemplate('member_transfer_settings', true, $content);
+			$content['settings'] = loadTemplate('member_transfer_settings', TRUE, $content);
 		}
 
 		// Free result
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('member_transfer_overview', false, $content);
+		loadTemplate('member_transfer_overview', FALSE, $content);
 		break;
 } // END - switch