addCreateTableSql() is now more encapsulated

[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 1a4b86cd530d0bfc0f04ac3b132d0e04685a6153..7b4fb0a4e371de935403dd41e58c1b9bd35aea33 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -64,16 +64,16 @@ if (isGetRequestParameterSet('rallye')) {
                                        postRequestParameter('points'),
                                        postRequestParameter('info')
                                ), __FILE__, __LINE__);
-                               loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_LEVEL_SAVED--}');
+                               displayMessage('{--RALLYE_PRICE_LEVEL_SAVED--}');
                        } else {
                                // Free memory
                                SQL_FREERESULT($result);
 
-                               // Price level found!
-                               loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}');
+                               // Price level found
+                               displayMessage('{--RALLYE_PRICE_ALREADY_FOUND--}');
                        }
                }
-       } elseif (isFormSent('remove')) {
+       } elseif (isFormSent('do_delete')) {
                // Check if at last one line is selected
                if (ifPostContainsSelections()) {
                        // Delete selected entries
@@ -83,11 +83,11 @@ if (isGetRequestParameterSet('rallye')) {
                        } // END - foreach
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_DELETED--}');
+                       displayMessage('{--RALLYE_ENTRIES_DELETED--}');
                } else {
-                       loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_NOT_DELETED--}');
+                       displayMessage('{--RALLYE_ENTRIES_NOT_DELETED--}');
                }
-       } elseif (isFormSent('change')) {
+       } elseif (isFormSent('do_edit')) {
                // Change entries
                foreach (postRequestParameter('level') as $id => $level) {
                        // Secure id
@@ -114,7 +114,7 @@ LIMIT 1",
                }
 
                // Output message
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_CHANGED--}');
+               displayMessage('{--RALLYE_ENTRIES_CHANGED--}');
        }
 
        if (isFormSent('edit')) {
@@ -147,7 +147,7 @@ LIMIT 1",
                } else {
                        // Nothing selected
                        $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestParameter('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
-                       loadTemplate('admin_settings_saved', false, $content);
+                       displayMessage($content);
                }
        } elseif (isFormSent('delete')) {
                // Check if at last one line is selected
@@ -174,7 +174,7 @@ LIMIT 1",
                } else {
                        // Nothing selected
                        $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestParameter('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
-                       loadTemplate('admin_settings_saved', false, $content);
+                       displayMessage($content);
                }
        } else {
                // a rallye was selected, so check if there are already prices assigned...
@@ -224,14 +224,9 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
-                       $content = array(
-                               'id'         => $content['id'],
-                               'title'      => $content['title'],
-                               'admin_id'   => $content['admin_id'],
-                               'login'      => $content['login'],
-                               'start'      => generateDateTime($content['start_time'], 3),
-                               'end'        => generateDateTime($content['end_time'], 3),
-                       );
+                       // @TODO rename: start->start_time, end->end_time
+                       $content['start'] = generateDateTime($content['start_time'], '3');
+                       $content['end']   = generateDateTime($content['end_time']  , '3');
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_list_rallye_prices_row', true, $content);
@@ -244,7 +239,7 @@ ORDER BY
                loadTemplate('admin_list_rallye_prices', false, $OUT);
        } else {
                // No rallyes setup so far
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
+               displayMessage('{--RALLYE_NO_RALLYES_SETUP--}');
        }
 }