A lot naming conventions applied, TODOs.txt updated

[mailer.git] / inc / modules / member / what-payout.php

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 246e0e31402819f3977cc7501045cbc250ec5919..26ae46ee72716ddb11b0ab73a2c1736c23219205 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -54,17 +54,8 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
        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 +68,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,36 +86,25 @@ 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 = '';
                        while ($content = SQL_FETCHARRAY($result_payouts)) {
-                               // Translate status
-                               $content['status'] = translatePayoutStatus();
-                               $content['status'] = '<div class="member_failed">' . $content['status'] . '</div>';
-
                                // 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'] = '<img src="' . $content['banner'] . '" alt="' . $content['alt'] . '" title="' . $content['alt'] . '" border="0" />';
+                                               $content['target_account'] = '<img src="' . $content['banner'] . '" alt="' . $content['link_text'] . '" title="' . $content['link_text'] . '" border="0" />';
                                        } else {
                                                // Textlink
-                                               $content['target_account'] = $content['alt'];
+                                               $content['target_account'] = $content['link_text'];
                                        }
                                        $content['target_bank'] = '<a href="' . generateDerefererUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
                                } // END - if
 
                                // Prepare data for the template
-                               $content = array(
-                                       'target_account'   => $content['target_account'],
-                                       'payout_total'     => $content['payout_total'],
-                                       'target_bank'      => $content['target_bank'],
-                                       'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2),
-                                       'status'           => $content['status'],
-                                       'type'             => $content['type'],
-                               );
+                               $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                                // Load row template and switch colors
                                $OUT .= loadTemplate('member_payout_row', true, $content);
@@ -184,7 +164,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__);