Function generateGenderSelectionBox() introduced, some cleanups:

[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..12f1dd24c2c9d0ae97bcd82f0366e5c651986ff6 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');
@@ -143,10 +143,10 @@ 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
@@ -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,7 +187,7 @@ 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);
@@ -196,7 +196,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
@@ -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--}');
        }
 }