X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=a41be9a31e4a584a1ac0095a1a7e7a51939a6a6a;hb=c1e83a8a85569bd7e8204471f90dcc0ae6247522;hp=2bbc1eeee18add4d0906cca71ea9261e59bc5a99;hpb=c01694397f34eee38b8f5933dbb385c122c79e50;p=mailer.git
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 2bbc1eeee1..a41be9a31e 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -1,7 +1,7 @@
0) {
// Check for code
- $code = generateRandomCode(getConfig('transfer_code'), postRequestElement('code_chk'), getUserId(), $content['max_transferable']);
- $valid_code = ($code == postRequestElement('code'));
+ $code = generateRandomCode(getConfig('transfer_code'), postRequestParameter('code_chk'), getMemberId(), $content['max_transferable']);
+ $valid_code = ($code == postRequestParameter('code'));
} else {
// Zero length (= disabled) is always valid!
$valid_code = true;
}
// Test password
- $valid_pass = ($pass == generateHash(postRequestElement('password'), $pass));
+ $valid_pass = ($pass == generateHash(postRequestParameter('password'), $pass));
// Test transfer amount
- $valid_amount = ((isPostRequestElementSet('points')) && (postRequestElement('points') <= $content['max_transferable']));
+ $valid_amount = ((isPostRequestParameterSet('points')) && (postRequestParameter('points') <= $content['max_transferable']));
// Test reason for transfer
- $valid_reason = (isPostRequestElementSet('reason'));
+ $valid_reason = (isPostRequestParameterSet('reason'));
// Test if a recipient is selected
- $valid_recipient = (postRequestElement('to_userid') > 0);
+ $valid_recipient = (postRequestParameter('to_userid') > 0);
// Check for nickname extension and set additional data
// @TODO Rewrite this to a filter
@@ -105,8 +99,8 @@ switch ($mode) {
// 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",
array(
- getUserId(),
- bigintval(postRequestElement('to_userid'))
+ getMemberId(),
+ bigintval(postRequestParameter('to_userid'))
), __FILE__, __LINE__);
// Do we have two entries?
@@ -134,78 +128,78 @@ switch ($mode) {
$TEST_NICK_REC = $content['recipient']['nickname'];
// Default is userids for subject line
- $SENDER = getUserId();
- $RECIPIENT = bigintval(postRequestElement('to_userid'));
+ $SENDER = getMemberId();
+ $RECIPIENT = bigintval(postRequestParameter('to_userid'));
// If nickname is installed we can set the nickname
// @TODO Rewrite this to a filter
if (isExtensionActive('nickname')) {
- if (($TEST_NICK_SENDER != getUserId()) && (!empty($TEST_NICK_SENDER))) {
+ if (($TEST_NICK_SENDER != getMemberId()) && (!empty($TEST_NICK_SENDER))) {
$SENDER = $content['sender']['nickname'];
}
- if (($TEST_NICK_REC != postRequestElement('to_userid')) && (!empty($TEST_NICK_REC))) {
+ if (($TEST_NICK_REC != postRequestParameter('to_userid')) && (!empty($TEST_NICK_REC))) {
$RECIPIENT = $content['recipient']['nickname'];
}
} // END - if
// Remember transfer reason and fancy date/time in constants
- $content['reason'] = secureString(postRequestElement('reason'));
+ $content['reason'] = secureString(postRequestParameter('reason'));
$content['expires'] = createFancyTime(getConfig('transfer_age'));
// Generate tranafer id
- $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getUserId(), postRequestElement('reason')));
+ $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(postRequestElement('to_userid')), getUserId(), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+ 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(getUserId(), bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+ 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(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
+ addPointsDirectly('member_transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
// ... and add it to current user's used points
- subtractPoints('transfer', getUserId(), postRequestElement('points'));
+ subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
// First send email to recipient
- $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid'));
+ $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
// Second send email to sender
- $message = loadEmailTemplate('member_transfer_sender', $content, getUserId());
+ $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());
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') . "{--TRANSFER_CONTINUE_OVERVIEW--} ");
+ loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "{--TRANSFER_CONTINUE_OVERVIEW--} ");
} elseif ($valid_code === false) {
// Invalid Touring code!
- loadTemplate('admin_settings_saved', false, "
{--TRANSFER_INVALID_CODE--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_CODE--}
');
+ unsetPostRequestParameter('ok');
} elseif ($valid_pass === false) {
// Wrong password entered
- loadTemplate('admin_settings_saved', false, "{--TRANSFER_INVALID_PASSWORD--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_PASSWORD--}
');
+ unsetPostRequestParameter('ok');
} elseif ($valid_amount === false) {
// Too much points entered
- loadTemplate('admin_settings_saved', false, "{--TRANSFER_INVALID_POINTS--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_POINTS--}
');
+ unsetPostRequestParameter('ok');
} elseif ($valid_reason === false) {
// No transfer reason entered
- loadTemplate('admin_settings_saved', false, "{--TRANSFER_INVALID_REASON--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_REASON--}
');
+ unsetPostRequestParameter('ok');
} elseif ($valid_recipient === false) {
// No recipient selected
- loadTemplate('admin_settings_saved', false, "{--TRANSFER_INVALID_RECIPIENT--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_RECIPIENT--}
');
+ unsetPostRequestParameter('ok');
} elseif ($valid_data === false) {
// No recipient/sender selected
- loadTemplate('admin_settings_saved', false, "{--TRANSFER_INVALID_DATA--}
");
- unsetPostRequestElement('ok');
+ loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_DATA--}
');
+ unsetPostRequestParameter('ok');
}
// Free result
@@ -217,11 +211,11 @@ switch ($mode) {
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(getUserId()), __FILE__, __LINE__);
+ 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(getUserId()), __FILE__, __LINE__);
+ array(getMemberId()), __FILE__, __LINE__);
}
if (SQL_NUMROWS($result) > 0) {
@@ -231,7 +225,7 @@ switch ($mode) {
// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
while (list($userid, $nick) = SQL_FETCHROW($result)) {
$OUT .= " 0) {
$rand = mt_rand(0, 99999);
- $code = generateRandomCode(getConfig('transfer_code'), $rand, getUserId(), $content['max_transferable']);
+ $code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']);
$img = generateImageOrCode($code, false);
- $content['captcha_code'] = " " . $img;
+ $content['captcha_code'] = ' ' . $img;
} else {
$code = '00000';
$content['captcha_code'] = loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_CODE'));
@@ -272,10 +266,10 @@ switch ($mode) {
$content['reason'] = '';
// Transfer maybe already entered valued'
- if (isGetRequestElementSet('ok')) {
+ if (isGetRequestParameterSet('ok')) {
// Get values from form
- $content['points'] = bigintval(postRequestElement('points'));
- $content['reason'] = secureString(postRequestElement('reason'));
+ $content['points'] = bigintval(postRequestParameter('points'));
+ $content['reason'] = secureString(postRequestParameter('reason'));
} // END - if
// Translate some array elements for template
@@ -307,8 +301,8 @@ switch ($mode) {
} // END - switch
// Run the SQL command and set total points to zero
- $totalPoints = 0;
- $result = SQL_QUERY_ESC($sql, array(getUserId()), __FILE__, __LINE__);
+ $totalPoints = '0';
+ $result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);
// Do we have entries?
if (SQL_NUMROWS($result) > 0) {
@@ -321,12 +315,12 @@ switch ($mode) {
// Prepare content for template
// @TODO Rewrite: tid->trans_id,stamp->time_trans
$row = array(
- 'sw' => $SW,
- 'tid' => $tid,
- 'stamp' => generateDateTime($stamp, 3),
- 'userid' => $userid,
- 'reason' => $reason,
- 'points' => translateComma($points)
+ 'sw' => $SW,
+ 'trans_id' => $tid,
+ 'stamp' => generateDateTime($stamp, 3),
+ 'userid' => $userid,
+ 'reason' => $reason,
+ 'points' => translateComma($points)
);
// Load row template
@@ -342,7 +336,7 @@ switch ($mode) {
} else {
// Nothing for in or out
$OUT = "
-
+
".loadTemplate('admin_settings_saved', true, $nothingMessage)."
";
@@ -375,8 +369,8 @@ KEY (`party_userid`)
) TYPE=HEAP", __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 %s",
- array(getUserId(), getConfig('transfer_max')), __FILE__, __LINE__);
+ $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);
@@ -388,7 +382,7 @@ 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(getUserId()), __FILE__, __LINE__);
+ array(getMemberId()), __FILE__, __LINE__);
while ($DATA = SQL_FETCHROW($result)) {
$DATA[] = 'OUT';
$DATA = implode("','", $DATA);
@@ -398,7 +392,7 @@ KEY (`party_userid`)
// Free memory
SQL_FREERESULT($result);
- $total = 0;
+ $total = '0';
if (SQL_NUMROWS($result) > 0) {
// 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",
@@ -428,7 +422,7 @@ KEY (`party_userid`)
} else {
// Nothing for in and out
$OUT = "
-
+
".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
";
@@ -458,39 +452,39 @@ KEY (`party_userid`)
default: // Overview page
// Check incoming transfers
- $total = countSumTotalData(getUserId(), 'user_transfers_in', 'id', 'userid', true);
+ $total = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
$content['in_link'] = $total;
if ($total > 0) {
- $content['in_link'] = "".$total." ";
+ $content['in_link'] = '' . $total . ' ';
} // END - if
// Check outgoing transfers
- $dmy = countSumTotalData(getUserId(), 'user_transfers_out', 'id', 'userid', true);
+ $dmy = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
// Add to total amount
$total += $dmy;
$content['out_link'] = $dmy;
if ($dmy > 0) {
- $content['out_link'] = "".$dmy." ";
+ $content['out_link'] = '' . $dmy . ' ';
} // END - if
// Total transactions
$content['all_link'] = $total;
if ($total > 0) {
- $content['all_link'] = "".$total." ";
+ $content['all_link'] = '' . $total . ' ';
} // END - if
if (isFormSent()) {
// Save settings
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",
- array(postRequestElement('opt_in'), getUserId()), __FILE__, __LINE__);
+ array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
// Rember for next switch() command
- getUserData('opt_in') = substr(postRequestElement('opt_in'), 0, 1);
+ getUserData('opt_in') = substr(postRequestParameter('opt_in'), 0, 1);
// "Settings saved..."
- loadTemplate('admin_settings_saved', false, "{--SETTINGS_SAVED--}
");
+ loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}
');
} // END - if
// Init entries
@@ -504,7 +498,7 @@ KEY (`party_userid`)
// Set 'new transfer' link according to above option
switch (getUserData('opt_in')) {
case 'Y':
- $content['new_link'] = "{--TRANSFER_NOW_LINK--} ";
+ $content['new_link'] = '{--TRANSFER_NOW_LINK--} ';
break;
case 'N':
@@ -524,14 +518,14 @@ ORDER BY
LIMIT 1",
array(
getConfig('transfer_timeout'),
- getUserId()
+ getMemberId()
), __FILE__, __LINE__);
// Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Load newest transaction
list($newest) = SQL_FETCHROW($result);
- $content['settings'] = sprintf(getMessage('TRANSFER_LATEST_IS'), generateDateTime($newest, 3));
+ $content['settings'] = getMaskedMessage('TRANSFER_LATEST_IS', generateDateTime($newest, 3));
} else {
// Load template
$content['settings'] = loadTemplate('member_transfer_settings', true, $content);