'order_points' and locked are now displayed, some array elements/language ids renamed

[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 edb05b80424fb096c29798ba73caf3bcfb007072..280912e15a8eb94c0396d4c85650c929f8b3d1be 100644 (file)
--- 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'));
+       displayMessage(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';
+$payoutPoints = getPayoutPoints(getMemberId());
 
 if (!isGetRequestParameterSet('payout')) {
        // Load payout types
@@ -76,14 +65,14 @@ WHERE
        %s >= `min_points`
 ORDER BY
        `type` ASC",
-               array($totalPoints), __FILE__, __LINE__);
+               array($payoutPoints), __FILE__, __LINE__);
        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
@@ -99,32 +88,21 @@ ORDER BY
                        // 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);
@@ -138,10 +116,10 @@ ORDER BY
                SQL_FREERESULT($result_payouts);
 
                // Output payout list
-               outputPayoutList($totalPoints);
+               outputPayoutList($payoutPoints);
        } else {
                // No payout types setup
-               loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+               displayMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
        }
 } else {
        // Chedk if he can get paid by selected type
@@ -153,7 +131,7 @@ ORDER BY
                $content = SQL_FETCHARRAY($result);
 
                // Calculate maximum value
-               $max     = round($totalPoints * $content['rate'] - 0.5);
+               $max     = round($payoutPoints * $content['rate'] - 0.5);
                $PAY_MAX = '0';
 
                // Calulcate points from submitted amount
@@ -164,11 +142,11 @@ ORDER BY
                }
 
                // Has enougth points to payout?
-               if ($totalPoints >= $content['min_points']) {
+               if ($payoutPoints >= $content['min_points']) {
                        // 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
@@ -184,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__);
 
@@ -205,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
@@ -229,7 +207,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
 
                                // Load template and output it
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
+                               displayMessage('{--MEMBER_PAYOUT_REQUEST_SENT--}');
                        } elseif ($content['allow'] == 'Y') {
                                // Prepare content
                                $content = array(
@@ -253,11 +231,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                        }
                } else {
                        // Not enougth points
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
+                       displayMessage('{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
                }
        } else {
                // id is invalid
-               loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
+               displayMessage('{--MEMBER_PAYOUT_ID_INVALID--}');
        }
 
        // Free result