A lot has been rewritten, ext-teams added, ext-forced continued:

[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 504dc1a0754b017f0d3ff3109c52d253c5d5f48b..00d5a450aaa4812f091ae4f6db164e48957c88ea 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -60,7 +60,7 @@ if (isGetRequestParameterSet('pid')) {
                if (empty($taskId)) $taskId = '0';
        } elseif ((empty($userid)) || ($userid == '0')) {
                // Cannot obtain member id!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
+               displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
        } else {
                // Get task id from URL
                $taskId = getRequestParameter('task');
@@ -89,7 +89,7 @@ if (isGetRequestParameterSet('pid')) {
                                if (!empty($ptype)) {
                                        // Obtain data from payout type
                                        $result = SQL_QUERY_ESC("SELECT
-       `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`
+       `from_account`,`from_pass`,`engine_url`,`engine_ret_ok`,`engine_ret_failed`,`pass_enc`,`allow_url`
 FROM
        `{?_MYSQL_PREFIX?}_payout_types`
 WHERE
@@ -143,14 +143,14 @@ LIMIT 1",
                                                // Output message
                                                if ($data['allow_url'] == 'Y') {
                                                        // Banner / Textlink request
-                                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
+                                                       displayMessage('{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
                                                } else {
                                                        // Normal request
-                                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
+                                                       displayMessage('{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
                                                }
 
                                                // Finally send mail
-                                               sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
+                                               sendEmail(getUserData('userid'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode('<br />', $ret);
@@ -165,7 +165,7 @@ LIMIT 1",
                                $content = array(
                                        'task' => $taskId,
                                        'pid'  => bigintval(getRequestParameter('pid')),
-                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
 
                                // Load template
@@ -187,16 +187,16 @@ LIMIT 1",
                                $message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
                                // Output message
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
+                               displayMessage('{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
                                // Finally send mail
-                               sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
+                               sendEmail(getUserData('userid'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
                        } else {
                                // Prepare content
                                $content = array(
                                        'task' => $taskId,
                                        'pid'  => bigintval(getRequestParameter('pid')),
-                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
 
                                // Load template
@@ -204,11 +204,11 @@ LIMIT 1",
                        }
                } else {
                        // Cannot load user data
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
+                       displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
                }
        } elseif ((empty($taskId)) || ($taskId == '0')) {
                // Failed loading task id
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
+               displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
        }
 } else {
        if (getRequestParameter('do') == 'delete') {
@@ -272,7 +272,7 @@ ORDER BY
                loadTemplate('admin_list_payouts', false, $OUT);
        } else {
                // No payout requests are sent so far
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
+               displayMessage('{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
        }
 }