Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[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 ce0dcf9ca401d822b19c80bf377a455c306fa250..512e2a7064a26076647f27cdeedc5d00a839cbd3 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -59,7 +59,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 
 } 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'))) {
+       if (!REQUEST_ISSET_POST('id')) {
                // Nothing selected for editing / deleting???
                REQUEST_UNSET_POST('edit');
                REQUEST_UNSET_POST('del');
@@ -73,14 +73,14 @@ if (REQUEST_ISSET_POST(('add'))) {
 
                        // Save entry
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_paytypes`
-SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id='%s' LIMIT 1",
-                               array(
-                                       REQUEST_POST('name', $id),
-                                       REQUEST_POST('rate', $id),
-                                       bigintval(REQUEST_POST('min', $id)),
-                                       REQUEST_POST('curr', $id),
-                                       $id
-                               ), __FILE__, __LINE__);
+SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE `id`='%s' LIMIT 1",
+                       array(
+                       REQUEST_POST('name', $id),
+                       REQUEST_POST('rate', $id),
+                       bigintval(REQUEST_POST('min', $id)),
+                       REQUEST_POST('curr', $id),
+                       $id
+                       ), __FILE__, __LINE__);
                }
 
                // Generate message
@@ -89,8 +89,8 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
                // Remove entries here...
                foreach (REQUEST_POST('id') as $id => $sel) {
                        // Remove entry
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
                }
 
                // Generate message
@@ -105,17 +105,17 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
 
 if (REQUEST_ISSET_POST(('add'))) {
        // Check if entry with same name does exists
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE pay_name='%s' LIMIT 1",
-               array(REQUEST_POST('pay_name')), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE pay_name='%s' LIMIT 1",
+       array(REQUEST_POST('pay_name')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // No entry found so add this line
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_rate, pay_min_count, pay_currency) VALUES ('%s','%s','%s','%s')",
-                       array(
-                               htmlspecialchars(REQUEST_POST('pay_name')),
-                               REVERT_COMMA(REQUEST_POST('pay_rate')),
-                               bigintval(REQUEST_POST('pay_min_count')),
-                               htmlspecialchars(REQUEST_POST('pay_currency'))
-                       ), __FILE__, __LINE__);
+               array(
+               htmlspecialchars(REQUEST_POST('pay_name')),
+               convertCommaToDot(REQUEST_POST('pay_rate')),
+               bigintval(REQUEST_POST('pay_min_count')),
+               htmlspecialchars(REQUEST_POST('pay_currency'))
+               ), __FILE__, __LINE__);
 
                // Payment type added!
                $message = sprintf(getMessage('ADMIN_SPONSOR_PAYTYPE_ADDED'), REQUEST_POST('pay_name'));
@@ -134,8 +134,8 @@ if (REQUEST_ISSET_POST(('add'))) {
        $OUT = ''; $SW = 2;
        foreach (REQUEST_POST('id') as $id => $sel) {
                // Load entry
-               $result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",
-                array(bigintval($id)), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1",
+               array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
                        list($name, $rate, $min, $curr) = SQL_FETCHROW($result);
@@ -146,7 +146,7 @@ if (REQUEST_ISSET_POST(('add'))) {
                                'id'   => bigintval($id),
                                'sw'   => bigintval($SW),
                                'name' => htmlspecialchars($name),
-                               'rate' => TRANSLATE_COMMA($rate),
+                               'rate' => translateComma($rate),
                                'min'  => bigintval($min),
                                'curr' => htmlspecialchars($curr)
                        );
@@ -181,7 +181,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 } else {
        // Load all payment types
        $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` ORDER BY pay_name",
-        __FILE__, __LINE__);
+       __FILE__, __LINE__);
 
        // Do we have some paytypes setup?
        if (SQL_NUMROWS($result) > 0) {
@@ -195,7 +195,7 @@ if (REQUEST_ISSET_POST(('add'))) {
                                'sw'       => $SW,
                                'id'       => $content['id'],
                                'name'     => $content['pay_name'],
-                               'rate'     => TRANSLATE_COMMA($content['pay_rate']),
+                               'rate'     => translateComma($content['pay_rate']),
                                'min'      => $content['pay_min_count'],
                                'currency' => $content['pay_currency']
                        );