X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=10cc4218b662b24025c93d14ddbd17c0a5629454;hp=e0d8f1fbc9a49c8e3f989163cc5ca07ce84f4d21;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index e0d8f1fbc9..10cc4218b6 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,7 +43,7 @@ if (!defined('__SECURITY')) {
}
// Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
if ((!isExtensionActive('transfer')) && (!isAdmin())) {
loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('transfer'));
@@ -54,15 +52,19 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
// 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
// Get total points and subtract the balance amount from it = maximum transferable points
- $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+ $total = getTotalPoints(getMemberId());
// Remember maximum value for template
$content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);
@@ -88,7 +90,7 @@ switch ($mode) {
$valid_reason = (isPostRequestParameterSet('reason'));
// Test if a recipient is selected
- $valid_recipient = (postRequestParameter('to_userid') > 0);
+ $valid_recipient = isValidUserId(postRequestParameter('to_userid'));
// Check for nickname extension and set additional data
// @TODO Rewrite this to a filter
@@ -125,7 +127,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,28 +135,28 @@ 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'));
+ $content['expires'] = '{%config,createFancyTime=transfer_age%}';
// 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')",
+ 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')",
+ 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')));
+ addPointsDirectly('transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
// ... and add it to current user's used points
subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
@@ -172,30 +174,30 @@ switch ($mode) {
sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
// Transfer is completed
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '
{--TRANSFER_CONTINUE_OVERVIEW--}');
+ loadTemplate('admin_settings_saved', false, '
{--TRANSFER_COMPLETED--}' . '
');
} elseif ($valid_code === false) {
// Invalid Touring code!
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_CODE--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
unsetPostRequestParameter('ok');
} elseif ($valid_pass === false) {
// Wrong password entered
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_PASSWORD--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}');
unsetPostRequestParameter('ok');
} elseif ($valid_amount === false) {
// Too much points entered
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_POINTS--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}');
unsetPostRequestParameter('ok');
} elseif ($valid_reason === false) {
// No transfer reason entered
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_REASON--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}');
unsetPostRequestParameter('ok');
} elseif ($valid_recipient === false) {
// No recipient selected
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_RECIPIENT--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}');
unsetPostRequestParameter('ok');
} elseif ($valid_data === false) {
// No recipient/sender selected
- loadTemplate('admin_settings_saved', false, '{--TRANSFER_INVALID_DATA--}
');
+ loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}');
unsetPostRequestParameter('ok');
}
@@ -215,15 +217,15 @@ switch ($mode) {
array(getMemberId()), __FILE__, __LINE__);
}
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Load list
- $OUT = "