Another try to fix bigintval() problem, ticket #114

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

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 3723a4a1684a41ffb4a1d8fe5f8d42a54242b8c7..380f1856be9982285a0cf6d503a59884005e5d11 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -50,19 +50,19 @@ if (REQUEST_ISSET_GET(('rallye'))) {
        if (REQUEST_ISSET_POST(('add'))) {
                if ((REQUEST_ISSET_POST(('level'))) && ((REQUEST_ISSET_POST(('points'))) || (REQUEST_ISSET_POST(('info'))))) {
                        // Submitted data is valid, but maybe we already have this price level?
-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s AND price_level='%s' LIMIT 1",
-                               array(bigintval(REQUEST_GET('rallye')), bigintval(REQUEST_POST('level'))), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s AND price_level='%s' LIMIT 1",
+                       array(bigintval(REQUEST_GET('rallye')), bigintval(REQUEST_POST('level'))), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 0) {
                                // Ok, new price level entered!
                                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
- array(
-       bigintval(REQUEST_GET('rallye')),
-       bigintval(REQUEST_POST('level')),
-       REQUEST_POST('points'),
-       REQUEST_POST('info')
-), __FILE__, __LINE__);
+                               array(
+                               bigintval(REQUEST_GET('rallye')),
+                               bigintval(REQUEST_POST('level')),
+                               REQUEST_POST('points'),
+                               REQUEST_POST('info')
+                               ), __FILE__, __LINE__);
                                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
                        } else {
                                // Free memory
@@ -74,12 +74,12 @@ VALUES ('%s','%s','%s','%s')",
                }
        } elseif (REQUEST_ISSET_POST('remove')) {
                // Check if at last one line is selected
-               $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+               $SEL = countPostSelection();
                if ($SEL > 0) {
                        // Delete selected entries
                        foreach (REQUEST_POST('sel') as $id => $sel) {
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
-                                       array(bigintval($id)), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
                        }
 
                        // Output message
@@ -94,14 +94,14 @@ VALUES ('%s','%s','%s','%s')",
                        $id = bigintval($id);
 
                        // Update entry
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_prices` SET rallye_id=%s, price_level='%s', points='%s', info='%s' WHERE id=%s LIMIT 1",
-                               array(
-                                       REQUEST_POST('rallye_id', $id),
-                                       bigintval($level),
-                                       REQUEST_POST('points', $id]),
-                                       REQUEST_POST('infos', $id),
-                                       $id
-                               ), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_prices` SET rallye_id=%s, price_level='%s', points='%s', info='%s' WHERE `id`=%s LIMIT 1",
+                       array(
+                       REQUEST_POST('rallye_id', $id),
+                       bigintval($level),
+                       REQUEST_POST('points', $id),
+                       REQUEST_POST('infos', $id),
+                       $id
+                       ), __FILE__, __LINE__);
                }
 
                // Output message
@@ -110,14 +110,14 @@ VALUES ('%s','%s','%s','%s')",
 
        if (REQUEST_ISSET_POST('edit')) {
                // Check if at last one line is selected
-               $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+               $SEL = countPostSelection();
                if ($SEL > 0) {
                        // Make selected editable
                        $OUT = ''; $SW = 2;
                        foreach (REQUEST_POST('sel') as $id => $sel) {
                                // Load data to selected rallye
-                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
-                                       array(bigintval($id)), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
@@ -125,7 +125,7 @@ VALUES ('%s','%s','%s','%s')",
                                $content = array(
                                        'sw'      => $SW,
                                        'id'      => $id,
-                                       'rallyes' => ADD_OPTION_LINES("rallye_data", "id", "title", $rallye),
+                                       'rallyes' => generateOptionList("rallye_data", 'id', "title", $rallye),
                                        'level'   => $level,
                                        'points'  => $points,
                                        'infos'   => $infos,
@@ -149,18 +149,18 @@ VALUES ('%s','%s','%s','%s')",
                }
        } elseif (REQUEST_ISSET_POST('del')) {
                // Check if at last one line is selected
-               $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+               $SEL = countPostSelection();
                if ($SEL > 0) {
                        // List all prices
                        $OUT = ''; $SW = 2;
                        foreach (REQUEST_POST('sel') as $id => $sel) {
                                // Load data to selected rallye
-                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
-                                       array(bigintval($id)), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
-                               if (empty($infos)) $infos = "---";
+                               if (empty($infos)) $infos = '---';
 
                                // Prepare data for the row template
                                $content = array(
@@ -190,14 +190,14 @@ VALUES ('%s','%s','%s','%s')",
        } else {
                // a rallye was selected, so check if there are already prices assigned...
                $result = SQL_QUERY_ESC("SELECT id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
-                       array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0) {
                        // Load all prices for the selected rallye
                        $OUT = ''; $SW = 2;
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Fix empty info
-                               if (empty($content['info'])) $content['info'] = "---";
+                               if (empty($content['info'])) $content['info'] = '---';
 
                                // Prepare data for the row template
                                // @TODO Rewritings: level->price_level, infos->info in template
@@ -252,10 +252,10 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
                                'select'     => $select,
                                'title'      => $content['title'],
                                'aid'        => $content['admin_id'],
-                               'email_link' => CREATE_EMAIL_LINK($content['admin_id']),
+                               'email_link' => generateMemberEmailLink($content['admin_id']),
                                'alogin'     => $content['login'],
-                               'start'      => MAKE_DATETIME($content['start_time'], "3"),
-                               'end'        => MAKE_DATETIME($content['end_time'], "3"),
+                               'start'      => generateDateTime($content['start_time'], '3'),
+                               'end'        => generateDateTime($content['end_time'], '3'),
                        );
 
                        // Load row template and switch color