New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

[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 fd7daa875fed076e7f64bdac46f555aca6fd27c7..1283c94854c0057fbb2df63f85018afa43a51689 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -100,7 +100,7 @@ ORDER BY
                        $OUT = ''; $SW = 2;
                        while ($content = SQL_FETCHARRAY($result_payouts)) {
                                // Translate status
-                               $content['status'] = getMessage('PAYOUT_MEMBER_STATUS_'.strtoupper($content['status']).'');
+                               $content['status'] = translatePayoutStatus();
                                $content['status'] = '<div class="member_failed">' . $content['status'] . '</div>';
 
                                // Nothing entered must be secured in member/what-payputs.php !
@@ -108,26 +108,23 @@ ORDER BY
                                        // 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['alt'] . '" title="' . $content['alt'] . '" border="0" />';
                                        } else {
                                                // Textlink
                                                $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
@@ -146,11 +143,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) {
@@ -195,7 +192,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 
                                        // Load templates
                                        $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
-                                       if (getExtensionVersion('admins') >= '0.4.1') {
+                                       if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
                                                $adm_tpl = 'admin_payout_request_banner';
                                        } else {
                                                $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
@@ -219,22 +216,22 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        $admin_tpl = '';
 
                                        // @TODO Rewrite this to a filter
-                                       if (getExtensionVersion('admins') >= '0.4.1') {
+                                       if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
                                                $admin_tpl = 'admin_payout_request';
                                        } // 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 +255,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