Next wave of lesser getMessage() usage and more EL

[mailer.git] / inc / modules / admin / what-list_payouts.php

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 9a2541368f0884aa49b4d273e7f943e4c9d0d2c5..4fa53756a50802615fb9320f5982824fabf9a9fb 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -62,7 +62,7 @@ if (isGetRequestParameterSet(('pid'))) {
                if (empty($task)) $task = '0';
        } elseif ((empty($userid)) || ($userid == '0')) {
                // Cannot obtain member id!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERID'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
        } else {
                // Get task id from URL
                $task = getRequestParameter('task');
@@ -75,7 +75,7 @@ if (isGetRequestParameterSet(('pid'))) {
                        debug_report_bug(__FILE__, __LINE__, 'No user account ' . $userid . ' found.');
                } // END - if
 
-               if ((getRequestParameter('do') == 'accept') && (!empty(getUserData('email')))) {
+               if ((getRequestParameter('do') == 'accept') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute accepting
                        if (isFormSent()) {
                                // Obtain payout type and other data
@@ -145,17 +145,17 @@ LIMIT 1",
                                                // Output message
                                                if ($data['allow_url'] == 'Y') {
                                                        // Banner / Textlink request
-                                                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED'));
+                                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
                                                } else {
                                                        // Normal request
-                                                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_ACCEPTED_NOTIFIED'));
+                                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
                                                }
 
                                                // Finally send mail
                                                sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_ACCEPTED_SUBJECT'), $message);
                                        } else {
                                                // Something goes wrong... :-(
-                                               $content = implode("<br />", $ret);
+                                               $content = implode('<br />', $ret);
                                                loadTemplate('admin_payout_failed_transfer', false, $content);
                                        }
                                } else {
@@ -173,7 +173,7 @@ LIMIT 1",
                                // Load template
                                loadTemplate('admin_payout_accept_form', false, $content);
                        }
-               } elseif ((getRequestParameter('do') == 'reject') && (!empty(getUserData('email')))) {
+               } elseif ((getRequestParameter('do') == 'reject') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute rejecting
                        if (isFormSent()) {
                                if ($task > 0) {
@@ -189,7 +189,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
                                // Output message
-                               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_REJECTED_NOTIFIED'));
+                               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
                                // Finally send mail
                                sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);
@@ -206,11 +206,11 @@ LIMIT 1",
                        }
                } else {
                        // Cannot load user data
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
                }
        } elseif ((empty($task)) || ($task == '0')) {
                // Failed loading task id
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
        }
 } else {
        if (getRequestParameter('do') == 'delete') {
@@ -265,16 +265,9 @@ ORDER BY
                                if (empty($content['target_bank']))    $content['target_bank']    = '---';
                        }
 
-                       // Remember data in array for the template
-                       $content = array(
-                               'sw'      => $SW,
-                               'ulink'   => generateUserProfileLink($content['userid']),
-                               'ptype'   => translateComma($content['payout_total']) . ' ' . $content['type'],
-                               'account' => $content['target_account'],
-                               'bank'    => $content['target_bank'],
-                               'tstamp'  => generateDateTime($content['payout_timestamp'], 2),
-                               'status'  => $content['status'],
-                       );
+                       // Add/Translate some data
+                       $content['sw']               = $SW;
+                       $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
                        // Add row and switch color
                        $OUT .= loadTemplate('admin_list_payouts_row', true, $content);
@@ -288,7 +281,7 @@ ORDER BY
                loadTemplate('admin_list_payouts', false, $OUT);
        } else {
                // No payout requests are sent so far
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_REQUESTS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
        }
 }