X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=b5b2ad477255d063c15f57abbf4acf313f994b77;hp=ffb4a4c809261aec2dcfc765886ad2640dabb3ea;hb=7cfec287d338c5b3af01b1a79881302505b3a795;hpb=fc162164725588cf75969f707faead9c9cd8e68b diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index ffb4a4c809..b5b2ad4772 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -14,8 +14,6 @@ * $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 * @@ -62,7 +60,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); @@ -88,7 +86,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 +123,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 +131,69 @@ 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')); // First send email to recipient $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid')); - sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJ--}' . ': ' . $SENDER, $message); + 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'], '{--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)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT); 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--}' . '
{--TRANSFER_CONTINUE_OVERVIEW--}
'); } 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 +213,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 .= "