X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=a141f3009a907bc2e0cbd3e6180508b89802c91f;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=d4c987d89f539d7cdcbd89c7fcf9e96fa2589d6d;hpb=06d179ae45f3f049003e6fe213249842b2a630fe;p=mailer.git diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index d4c987d89f..a141f3009a 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -53,7 +54,7 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) { // Check for mode in GET $mode = ''; -if (isGetRequestElementSet('mode')) $mode = getRequestElement('mode'); +if (isGetRequestParameterSet('mode')) $mode = getRequestParameter('mode'); // Check for "faker" if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = ''; @@ -61,7 +62,7 @@ if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = ''; 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); @@ -70,24 +71,24 @@ switch ($mode) { // Add new transfer if (getConfig('transfer_code') > 0) { // Check for code - $code = generateRandomCode(getConfig('transfer_code'), postRequestElement('code_chk'), getMemberId(), $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 = isValidUserId(postRequestParameter('to_userid')); // Check for nickname extension and set additional data // @TODO Rewrite this to a filter @@ -100,7 +101,7 @@ switch ($mode) { $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( getMemberId(), - bigintval(postRequestElement('to_userid')) + bigintval(postRequestParameter('to_userid')) ), __FILE__, __LINE__); // Do we have two entries? @@ -119,17 +120,13 @@ switch ($mode) { $content['recipient']['nickname'] = ''; } // END - if - // Translate some data - $content['sender']['gender'] = translateGender($content['sender']['gender']); - $content['recipient']['gender'] = translateGender($content['recipient']['gender']); - // Prepare variables for testing $TEST_NICK_SENDER = $content['sender']['nickname']; $TEST_NICK_REC = $content['recipient']['nickname']; // Default is userids for subject line $SENDER = getMemberId(); - $RECIPIENT = bigintval(postRequestElement('to_userid')); + $RECIPIENT = bigintval(postRequestParameter('to_userid')); // If nickname is installed we can set the nickname // @TODO Rewrite this to a filter @@ -138,68 +135,68 @@ switch ($mode) { $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), getMemberId(), 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')), getMemberId(), 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(getMemberId(), 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', getMemberId(), postRequestElement('points')); + subtractPoints('transfer', getMemberId(), postRequestParameter('points')); // First send email to recipient - $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid')); - sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message); + $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid')); + sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJECT--}' . ': ' . $SENDER, $message); // Second send email to sender $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId()); - sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message); + sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message); // At last send admin mail(s) - $adminSubject = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT); + $adminSubject = sprintf("%s (%s->%s)", '{--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, '{--TRANSFER_COMPLETED--}' . '
{--TRANSFER_CONTINUE_OVERVIEW--}'); } elseif ($valid_code === false) { // Invalid Touring code! loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_CODE--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } elseif ($valid_pass === false) { // Wrong password entered loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_PASSWORD--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } elseif ($valid_amount === false) { // Too much points entered loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_POINTS--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } elseif ($valid_reason === false) { // No transfer reason entered loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_REASON--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } elseif ($valid_recipient === false) { // No recipient selected loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_RECIPIENT--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } elseif ($valid_data === false) { // No recipient/sender selected loadTemplate('admin_settings_saved', false, '
{--TRANSFER_INVALID_DATA--}
'); - unsetPostRequestElement('ok'); + unsetPostRequestParameter('ok'); } // Free result @@ -218,15 +215,15 @@ switch ($mode) { array(getMemberId()), __FILE__, __LINE__); } - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // Load list - $OUT = " + '; // @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 .= "