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

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

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index cd7a8e117e06dd15f5e89deda0fabd83cb4aaaa2..12098ede2f5f57a6fdc8fe15deef15af763709a4 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -52,12 +52,12 @@ if (REQUEST_ISSET_POST(('add'))) {
        if ((REQUEST_POST('pay_min_count') == 0) || (!REQUEST_ISSET_POST(('pay_min_count')))) REQUEST_UNSET_POST(('add'));
        if (!REQUEST_ISSET_POST(('pay_currency'))) REQUEST_UNSET_POST(('add'));
 
        if ((REQUEST_POST('pay_min_count') == 0) || (!REQUEST_ISSET_POST(('pay_min_count')))) REQUEST_UNSET_POST(('add'));
        if (!REQUEST_ISSET_POST(('pay_currency'))) REQUEST_UNSET_POST(('add'));
 

-} elseif ((REQUEST_ISSET_POST(('edit'))) || (REQUEST_ISSET_POST(('del'))) || (REQUEST_ISSET_POST(('change'))) || (REQUEST_ISSET_POST(('remove')))) {
+} elseif ((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST('del')) || (REQUEST_ISSET_POST(('change'))) || (REQUEST_ISSET_POST(('remove')))) {

        // Check if at least one entry was selected
        if (!REQUEST_ISSET_POST(('id'))) {
                // Nothing selected for editing / deleting???
        // Check if at least one entry was selected
        if (!REQUEST_ISSET_POST(('id'))) {
                // Nothing selected for editing / deleting???

-               REQUEST_UNSET_POST(('edit'));
-               REQUEST_UNSET_POST(('del'));
+               REQUEST_UNSET_POST('edit');
+               REQUEST_UNSET_POST('del');

                REQUEST_UNSET_POST(('change'));
                REQUEST_UNSET_POST(('remove'));
        } elseif (REQUEST_ISSET_POST(('change'))) {
                REQUEST_UNSET_POST(('change'));
                REQUEST_UNSET_POST(('remove'));
        } elseif (REQUEST_ISSET_POST(('change'))) {


@@ -113,18 +113,18 @@ if (REQUEST_ISSET_POST(('add'))) {
                        ), __FILE__, __LINE__);
 
                // Payment type added!
                        ), __FILE__, __LINE__);
 
                // Payment type added!

-               $MSG = ADMIN_SPONSOR_PAYTYPE_ADDED_1.REQUEST_POST('pay_name').ADMIN_SPONSOR_PAYTYPE_ADDED_2;
+               $MSG = sprintf(getMessage('ADMIN_SPONSOR_PAYTYPE_ADDED'), REQUEST_POST('pay_name'));

        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Entry does already exists
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Entry does already exists

-               $MSG = ADMIN_SPONSOR_PAYTYPE_ALREADY_1.REQUEST_POST('pay_name').ADMIN_SPONSOR_PAYTYPE_ALREADY_2;
+               $MSG = sprintf(getMessage('ADMIN_SPONSOR_PAYTYPE_ALREADY'), REQUEST_POST('pay_name'));

        }
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
        }
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);

-} elseif ((REQUEST_ISSET_POST(('edit'))) || (REQUEST_ISSET_POST(('del')))) {
+} elseif ((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST('del'))) {

        // Load all data
        $OUT = ""; $SW = 2;
        foreach (REQUEST_POST('id') as $id => $sel) {
        // Load all data
        $OUT = ""; $SW = 2;
        foreach (REQUEST_POST('id') as $id => $sel) {


@@ -146,7 +146,7 @@ if (REQUEST_ISSET_POST(('add'))) {
                                'curr' => htmlspecialchars($curr)
                        );
 
                                'curr' => htmlspecialchars($curr)
                        );
 

-                       if (REQUEST_ISSET_POST(('edit'))) {
+                       if (REQUEST_ISSET_POST('edit')) {

                                // Edit entry
                                $OUT .= LOAD_TEMPLATE("admin_list_sponsor_pay_edit_row", true, $content);
                        } else {
                                // Edit entry
                                $OUT .= LOAD_TEMPLATE("admin_list_sponsor_pay_edit_row", true, $content);
                        } else {


@@ -160,13 +160,13 @@ if (REQUEST_ISSET_POST(('add'))) {
 
                // Switch colors
                $SW = 3 - $SW;
 
                // Switch colors
                $SW = 3 - $SW;

-       }
+       } // END - foreach

 
        // Remember content in constant
        define('__SPONSOR_ROWS', $OUT);
 
        // Load main template depending on mode (edit/delete)
 
        // Remember content in constant
        define('__SPONSOR_ROWS', $OUT);
 
        // Load main template depending on mode (edit/delete)

-       if (REQUEST_ISSET_POST(('edit'))) {
+       if (REQUEST_ISSET_POST('edit')) {

                // Load main edit template
                LOAD_TEMPLATE("admin_list_sponsor_pay_edit");
        } else {
                // Load main edit template
                LOAD_TEMPLATE("admin_list_sponsor_pay_edit");
        } else {


@@ -181,18 +181,18 @@ if (REQUEST_ISSET_POST(('add'))) {
        // Do we have some paytypes setup?
        if (SQL_NUMROWS($result) > 0) {
                // Prepare variables for listing
        // Do we have some paytypes setup?
        if (SQL_NUMROWS($result) > 0) {
                // Prepare variables for listing

-               $SW = 2; $OUT = "";
+               $OUT = ""; $SW = 2;

 
                // List alle found payment types
 
                // List alle found payment types

-               while (list($id, $name, $rate, $min, $currency) = SQL_FETCHROW($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {

                        // Remember data in array
                        $content = array(
                                'sw'       => $SW,
                        // Remember data in array
                        $content = array(
                                'sw'       => $SW,

-                               'id'       => $id,
-                               'name'     => $name,
-                               'rate'     => TRANSLATE_COMMA($rate),
-                               'min'      => $min,
-                               'currency' => $currency
+                               'id'       => $content['id'],
+                               'name'     => $content['pay_name'],
+                               'rate'     => TRANSLATE_COMMA($content['pay_rate']),
+                               'min'      => $content['pay_min_count'],
+                               'currency' => $content['pay_currency']

                        );
 
                        // Add row
                        );
 
                        // Add row


@@ -200,7 +200,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 
                        // Switch colors
                        $SW = 3 - $SW;
 
                        // Switch colors
                        $SW = 3 - $SW;

-               }
+               } // END - while

 
                // Free memory
                SQL_FREERESULT($result);
 
                // Free memory
                SQL_FREERESULT($result);