More rewrites to make use of (cached) wrapper functions

[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 73ebf494d79309ac7d27908006c756ecdb24f5ac..edb05b80424fb096c29798ba73caf3bcfb007072 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -77,7 +77,7 @@ WHERE
 ORDER BY
        `type` ASC",
                array($totalPoints), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Free memory
                SQL_FREERESULT($result);
 
@@ -95,9 +95,9 @@ 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'] = translatePayoutStatus();
@@ -114,30 +114,25 @@ ORDER BY
                                                $content['target_account'] = $content['alt'];
                                        }
                                        $content['target_bank'] = '<a href="' . generateDerefererUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
-                               } 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'],
+                                       'payout_total'     => $content['payout_total'],
                                        'target_bank'      => $content['target_bank'],
                                        'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2),
-                                       'status'           => $content['status']
+                                       'status'           => $content['status'],
+                                       'type'             => $content['type'],
                                );
 
                                // 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 +141,11 @@ ORDER BY
                outputPayoutList($totalPoints);
        } else {
                // No payout types setup
-               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_SETUP_INCOMPLETE'));
+               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) {
@@ -224,17 +219,17 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        } // END - if
                                }
 
-                               // Generate task
-                               createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $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('MEMBER_PAYOUT_REQUEST_SUBJ'), $message_mem);
+                               sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem);
 
                                // To admin(s)
-                               sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
+                               sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
 
                                // Load template and output it
-                               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_REQUEST_SENT'));
+                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
                        } elseif ($content['allow'] == 'Y') {
                                // Prepare content
                                $content = array(
@@ -258,11 +253,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                        }
                } else {
                        // Not enougth points
-                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_POINTS_NOT_ENOUGTH'));
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
                }
        } else {
                // id is invalid
-               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_ID_INVALID'));
+               loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
        }
 
        // Free result