X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=8e62a5bd70a42d0c6157b128378735fc753b3765;hb=c4823d28fd0bd22250b16d73f2034f36fc54abda;hp=95ccddf4d562bbf4078749af90712cfc68838180;hpb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;p=mailer.git diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 95ccddf4d5..8e62a5bd70 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.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 * @@ -47,24 +45,15 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -addMenuDescription('member', __FILE__); +addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('payout')) && (!isAdmin())) { loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('payout')); return; } // END - if -// Get total points -$totalPoints = countSumTotalData(getMemberId(), 'user_points', 'points'); - -// Get used points -$usedPoints = countSumTotalData(getMemberId(), 'user_data', 'used_points'); - // Translate point into comma -$totalPoints = ($totalPoints - $usedPoints); - -// Sanity check... -if (empty($totalPoints)) $totalPoints = '0.00000'; +$totalPoints = getTotalPoints(getMemberId()); if (!isGetRequestParameterSet('payout')) { // Load payout types @@ -77,13 +66,13 @@ WHERE ORDER BY `type` ASC", array($totalPoints), __FILE__, __LINE__); - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // Free memory SQL_FREERESULT($result); // Check for his payouts $result_payouts = SQL_QUERY_ESC("SELECT - p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS banner + p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text, p.banner_url AS banner FROM `{?_MYSQL_PREFIX?}_user_payouts` AS p LEFT JOIN @@ -95,49 +84,33 @@ WHERE ORDER BY p.payout_timestamp DESC", array(getMemberId()), __FILE__, __LINE__); - if (SQL_NUMROWS($result_payouts) > 0) { + if (!SQL_HASZERONUMS($result_payouts)) { // List all his requests - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result_payouts)) { - // Translate status - $content['status'] = getMessage('PAYOUT_MEMBER_STATUS_'.strtoupper($content['status']).''); - $content['status'] = '
' . $content['status'] . '
'; - // Nothing entered must be secured in member/what-payputs.php ! if ($content['allow'] == 'Y') { // Banner/Textlink views/clicks request if (!empty($content['banner'])) { // Banner - $content['target_account'] = "\"".$content['alt']."\""; + $content['target_account'] = '' . $content['link_text'] . ''; } else { // Textlink - $content['target_account'] = $content['alt']; + $content['target_account'] = $content['link_text']; } $content['target_bank'] = '{--CLICK_HERE--}'; - } else { - // e-currency payout request - if (empty($content['target_account'])) $content['target_account'] = '---'; - if (empty($content['target_bank'])) $content['target_bank'] = '---'; - } + } // END - if // Prepare data for the template - $content = array( - 'sw' => $SW, - 'target_account' => $content['target_account'], - 'points' => translateComma($content['payout_total']) . ' ' . $content['type'], - 'target_bank' => $content['target_bank'], - 'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2), - 'status' => $content['status'] - ); + $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2); // Load row template and switch colors $OUT .= loadTemplate('member_payout_row', true, $content); - $SW = 3 - $SW; - } + } // END - while // Load template loadTemplate('member_payout', false, $OUT); - } + } // END - if // Free memory SQL_FREERESULT($result_payouts); @@ -146,11 +119,11 @@ ORDER BY outputPayoutList($totalPoints); } else { // No payout types setup - loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}'); } } else { // Chedk if he can get paid by selected type - $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", array(bigintval(getRequestParameter('payout'))), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { @@ -173,7 +146,7 @@ ORDER BY // Ok, he can get be paid if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) { // Remember points in array - setPostRequestParameter('payout_points', translateComma($points)); + setPostRequestParameter('payout_points', $points); setPostRequestParameter('type' , $content['type']); // Subtract points from member's account @@ -189,7 +162,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')", bigintval(postRequestParameter('payout')), bigintval(getRequestParameter('payout')), postRequestParameter('turl'), - postRequestParameter('alt'), + postRequestParameter('link_text'), postRequestParameter('banner') ), __FILE__, __LINE__); @@ -210,7 +183,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", bigintval(postRequestParameter('account')), postRequestParameter('bank'), bigintval(getRequestParameter('payout')), - postRequestParameter('pass') + postRequestParameter('password') ), __FILE__, __LINE__); // Load templates @@ -224,17 +197,17 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", } // END - if } - // Generate task - createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getMemberId()); + // Generate task (we ignore the task id here) + createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $message_adm, 'PAYOUT_REQUEST', getMemberId()); // Send out mails - sendEmail(getMemberId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem); + sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem); // To admin(s) - sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId()); + sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId()); // Load template and output it - loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}'); } elseif ($content['allow'] == 'Y') { // Prepare content $content = array( @@ -258,11 +231,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", } } else { // Not enougth points - loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}'); } } else { // id is invalid - loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}'); } // Free result