Rewrites/fixes for handling config entries in SQLs

[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 66789a1c30dc71e3bad3fd465b0367754e2a2cd0..50980e5d691de22c4f53ae5a6c9b077b75c5aacc 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('PAYOUT_FAILED_OBTAIN_USERID'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERID'));
        } else {
                // Get task id from URL
                $task = getRequestParameter('task');
@@ -72,7 +72,7 @@ if (isGetRequestParameterSet(('pid'))) {
                // Load user's data
                if (!fetchUserData($userid)) {
                        // Abort here because it is not valid!
-                       debug_report_bug('No user account ' . $userid . ' found.');
+                       debug_report_bug(__FILE__, __LINE__, 'No user account ' . $userid . ' found.');
                } // END - if
 
                if ((getRequestParameter('do') == 'accept') && (!empty(getUserData('email')))) {
@@ -120,7 +120,7 @@ LIMIT 1",
                                                }
 
                                                // Transfer variables...
-                                               $reason = encodeString(getMessage('PAYOUT_REASON_PAYOUT'), false);
+                                               $reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), false);
 
                                                // Execute transfer
                                                $ret = sendGetRequest($data['engine_url']);
@@ -145,14 +145,14 @@ LIMIT 1",
                                                // Output message
                                                if ($data['allow_url'] == 'Y') {
                                                        // Banner / Textlink request
-                                                       loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_BANNER_ACCEPTED_NOTIFIED'));
+                                                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED'));
                                                } else {
                                                        // Normal request
-                                                       loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ACCEPTED_NOTIFIED'));
+                                                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_ACCEPTED_NOTIFIED'));
                                                }
 
                                                // Finally send mail
-                                               sendEmail(getUserData('email'), getMessage('PAYOUT_ACCEPTED_SUBJECT'), $message);
+                                               sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_ACCEPTED_SUBJECT'), $message);
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode("<br />", $ret);
@@ -160,7 +160,7 @@ LIMIT 1",
                                        }
                                } else {
                                        // Cannot load payout id
-                                       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
+                                       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
                                }
                        } else {
                                // Prepare content
@@ -189,10 +189,10 @@ LIMIT 1",
                                $message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
                                // Output message
-                               loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REJECTED_NOTIFIED'));
+                               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_REJECTED_NOTIFIED'));
 
                                // Finally send mail
-                               sendEmail(getUserData('email'), getMessage('PAYOUT_REJECTED_SUBJECT'), $message);
+                               sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);
                        } else {
                                // Prepare content
                                $content = array(
@@ -206,11 +206,11 @@ LIMIT 1",
                        }
                } else {
                        // Cannot load user data
-                       loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_USERDATA'));
+                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA'));
                }
        } elseif ((empty($task)) || ($task == '0')) {
                // Failed loading task id
-               loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_TASK_ID'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID'));
        }
 } else {
        if (getRequestParameter('do') == 'delete') {
@@ -239,10 +239,10 @@ ORDER BY
                while ($content = SQL_FETCHARRAY($result)) {
                        if ($content['status'] == 'NEW') {
                                // Generate links for direct accepting and rejecting
-                               $content['status'] = '<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=' . $content['id'] . '%}">{--PAYOUT_ACCEPT_PAYOUT--}</a>|<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=' . $content['id'] . '%}">{--PAYOUT_REJECT_PAYOUT--}</a>';
+                               $content['status'] = '<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=' . $content['id'] . '%}">{--ADMIN_PAYOUT_ACCEPT_PAYOUT--}</a>|<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=' . $content['id'] . '%}">{--ADMIN_PAYOUT_REJECT_PAYOUT--}</a>';
                        } else {
                                // Translate status
-                               $content['status'] = getMessage('PAYOUT_STATUS_'.strtoupper($content['status']).'');
+                               $content['status'] = translatePayoutStatus($content['status']);
                                $content['status'] = '<div class="admin_failed">' . $content['status'] . '</div>';
                        }
 
@@ -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('PAYOUT_ADMIN_NO_REQUESTS_FOUND'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_REQUESTS_FOUND'));
        }
 }