A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 4a1c9db2c7794cd9afdf8af8e7693725f43f5099..ff2bfde0674b319fe0a4abe6381c4c025063d149 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -57,7 +57,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                if (empty($task)) $task = 0;
        } elseif ((empty($uid)) || ($uid == "0")) {
                // Cannot obtain member ID!
-               LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_FAILED_OBTAIN_USERID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_FAILED_OBTAIN_USERID'));
        } else {
                // Get task ID from URL
                $task = REQUEST_GET('task');
@@ -135,10 +135,10 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                                // Output message
                                                if ($allow == "Y") {
                                                        // Banner / Textlink request
-                                                       LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_BANNER_ACCEPTED_NOTIFIED);
+                                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_BANNER_ACCEPTED_NOTIFIED'));
                                                } else {
                                                        // Normal request
-                                                       LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_ACCEPTED_NOTIFIED);
+                                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_ACCEPTED_NOTIFIED'));
                                                }
 
                                                // Finally send mail
@@ -150,7 +150,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                        }
                                } else {
                                        // Cannot load payout id
-                                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".PAYOUT_FAILED_OBTAIN_PAYOUT_ID."</div>");
+                                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">{--PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>");
                                }
                        } else {
                                // Load template
@@ -172,7 +172,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                $msg = LOAD_EMAIL_TEMPLATE("member_payout_rejected", REQUEST_POST('text'), $uid);
 
                                // Output message
-                               LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REJECTED_NOTIFIED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_REJECTED_NOTIFIED'));
 
                                // Finally send mail
                                SEND_EMAIL($email, PAYOUT_REJECTED_SUBJECT, $msg);
@@ -182,7 +182,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                        }
                } else {
                        // Cannot load user data
-                       LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_FAILED_OBTAIN_USERDATA);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_FAILED_OBTAIN_USERDATA'));
                }
        } elseif ((empty($task)) || ($task == "0")) {
                // Failed loading task ID
@@ -205,55 +205,44 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List found payouts
                $OUT = ""; $SW = 2;
-               while (list($pid, $uid, $total, $account, $bank, $type, $tstamp, $status, $allow, $url, $alt, $banner) = SQL_FETCHROW($result)) {
-                       if ($status == "NEW") {
+               while ($content = SQL_FETCHROW($result)) {
+                       if ($content['status'] == "NEW") {
                                // Generate links for direct accepting and rejecting
-                               $status = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$pid."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$pid."\">".PAYOUT_REJECT_PAYOUT."</a>";
+                               $content['status'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$content['id']."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$content['id']."\">".PAYOUT_REJECT_PAYOUT."</a>";
                        } else {
                                // Translate status
-                               $status = constant('PAYOUT_STATUS_'.strtoupper($status).'');
-                               $status = "<div class=\"admin_failed\">".$status."</div>";
+                               $content['status'] = constant('PAYOUT_STATUS_'.strtoupper($content['status']).'');
+                               $content['status'] = "<div class=\"admin_failed\">".$content['status']."</div>";
                        }
 
                        // Nothing entered must be secured in member/what-payputs.php !
-                       if ($allow == "Y") {
+                       if ($content['allow'] == "Y") {
                                // Banner/Textlink views/clicks request
-                               if (!empty($banner)) {
-                                       // Prepare array for the banner
-                                       $content = array(
-                                               'banner' => $banner,
-                                               'alt'    => $alt,
-                                               'url'    => $url,
-                                       );
-
+                               if (!empty($content['banner'])) {
                                        // Load template for the banner
-                                       $account = LOAD_TEMPLATE("admin_list_payouts_banner", true, $content);
+                                       $content['target_account'] = LOAD_TEMPLATE("admin_list_payouts_banner", true, $content);
                                } else {
                                        // Textlink
-                                       $content = array(
-                                               'txt_link' => $alt,
-                                               'txt_url'  => $url,
-                                       );
-                                       $account = LOAD_TEMPLATE("admin_list_payouts_txt", true, $content);
+                                       $content['target_account'] = LOAD_TEMPLATE("admin_list_payouts_txt", true, $content);
                                }
 
                                // Admins can addionally test the URL for framekillers
-                               $bank = "<a href=\"".FRAMETESTER($url)."\" target=\"_blank\">".CLICK_HERE."</a>";
+                               $content['target_bank'] = "<a href=\"".FRAMETESTER($content['url'])."\" target=\"_blank\">{--CLICK_HERE--}</a>";
                        } else {
                                // e-currency payout request
-                               if (empty($account)) $account = "---";
-                               if (empty($bank))    $bank    = "---";
+                               if (empty($content['target_account'])) $content['target_account'] = "---";
+                               if (empty($content['target_bank']))    $content['target_bank']    = "---";
                        }
 
                        // Remember data in array for the template
                        $content = array(
                                'sw'      => $SW,
-                               'ulink'   => ADMIN_USER_PROFILE_LINK($uid),
-                               'ptype'   => TRANSLATE_COMMA($total)." ".COMPILE_CODE($type),
-                               'account' => $account,
-                               'bank'    => $bank,
-                               'tstamp'  => MAKE_DATETIME($tstamp, "2"),
-                               'status'  => $status,
+                               'ulink'   => ADMIN_USER_PROFILE_LINK($content['userid']),
+                               'ptype'   => TRANSLATE_COMMA($content['payout_total'])." ".COMPILE_CODE($content['type']),
+                               'account' => $content['target_account'],
+                               'bank'    => $content['target_bank'],
+                               'tstamp'  => MAKE_DATETIME($content['payout_timestamp'], "2"),
+                               'status'  => $content['status'],
                        );
 
                        // Add row and switch color
@@ -269,7 +258,7 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
                LOAD_TEMPLATE("admin_list_payouts");
        } else {
                // No payout requests are sent so far
-               LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_ADMIN_NO_REQUESTS_FOUND);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PAYOUT_ADMIN_NO_REQUESTS_FOUND'));
        }
 }
 //