Changed all admin getter, closed internal TODOs:

[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 ce08c0b4c845d1f1d8bae7a664637b8bb85bde99..1c78c45384cc269cc1190c326c50f9cea5340174 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -55,21 +55,24 @@ if (isGetRequestParameterSet('rallye')) {
 
                        if (SQL_HASZERONUMS($result)) {
                                // 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')",
+                               SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_rallye_prices`
+(`rallye_id`, `price_level`, `points`, `info`)
+       VALUES
+(%s, %s, '%s', '%s')",
                                array(
                                        bigintval(getRequestParameter('rallye')),
                                        bigintval(postRequestParameter('level')),
                                        postRequestParameter('points'),
                                        postRequestParameter('info')
                                ), __FILE__, __LINE__);
-                               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
+                               loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_LEVEL_SAVED--}');
                        } else {
                                // Free memory
                                SQL_FREERESULT($result);
 
                                // Price level found!
-                               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_ALREADY_FOUND'));
+                               loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}');
                        }
                }
        } elseif (isFormSent('remove')) {
@@ -82,9 +85,9 @@ VALUES ('%s','%s','%s','%s')",
                        } // END - foreach
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_DELETED'));
+                       loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_DELETED--}');
                } else {
-                       loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_NOT_DELETED'));
+                       loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_NOT_DELETED--}');
                }
        } elseif (isFormSent('change')) {
                // Change entries
@@ -113,7 +116,7 @@ LIMIT 1",
                }
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_CHANGED--}');
        }
 
        if (isFormSent('edit')) {
@@ -123,25 +126,21 @@ LIMIT 1",
                        $OUT = ''; $SW = 2;
                        foreach (postRequestParameter('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",
+                               $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);
+                               $content = SQL_FETCHARRAY($result);
                                SQL_FREERESULT($result);
 
-                               // Prepare data for the row template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $id,
-                                       'rallyes' => generateOptionList('rallye_data', 'id', 'title', $rallye),
-                                       'level'   => $level,
-                                       'points'  => $points,
-                                       'infos'   => $infos,
-                               );
+                               // Add more content
+                               $content['sw']             = $SW;
+                               $content['rallye_content'] = generateOptionList('rallye_data', 'id', 'title', $content['rallye_id']);
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_edit_row', true, $content);
                                $SW = 3 - $SW;
                        } // END - foreach
+
+                       // Remember row content
                        $content['rows'] = $OUT;
 
                        // Prepare data for the main template
@@ -163,19 +162,11 @@ LIMIT 1",
                                // 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__);
-                               list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
+                               $content = SQL_FETCHARRAY($result);
                                SQL_FREERESULT($result);
 
-                               if (empty($infos)) $infos = '---';
-
-                               // Prepare data for the row template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $id,
-                                       'level'   => $level,
-                                       'points'  => $points,
-                                       'infos'   => $infos,
-                               );
+                               // Add color switch
+                               $content['sw'] = $SW;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_del_row', true, $content);
@@ -202,18 +193,8 @@ LIMIT 1",
                        // Load all prices for the selected rallye
                        $OUT = ''; $SW = 2;
                        while ($content = SQL_FETCHARRAY($result)) {
-                               // Fix empty info
-                               if (empty($content['info'])) $content['info'] = '---';
-
-                               // Prepare data for the row template
-                               // @TODO Rewritings: level->price_level, infos->info in template
-                               $content = array(
-                                       'sw'      => $SW,
-                                       'id'      => $content['id'],
-                                       'level'   => $content['price_level'],
-                                       'points'  => $content['points'],
-                                       'infos'   => $content['info'],
-                               );
+                               // Add color switch
+                               $content['sw'] = $SW;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_config_rallye_prices_row', true, $content);
@@ -260,7 +241,6 @@ ORDER BY
                                'id'         => $content['id'],
                                'title'      => $content['title'],
                                'admin_id'   => $content['admin_id'],
-                               'admin_link' => generateAdminLink($content['admin_id']),
                                'login'      => $content['login'],
                                'start'      => generateDateTime($content['start_time'], 3),
                                'end'        => generateDateTime($content['end_time'], 3),
@@ -278,7 +258,7 @@ ORDER BY
                loadTemplate('admin_list_rallye_prices', false, $OUT);
        } else {
                // No rallyes setup so far
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
        }
 }