Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index f7ef95f333c99947615c89e286cd74c8702a987a..8286c6e260d8bbe28c22b9c60e85a7e9edcdb8c1 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -45,27 +45,27 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
        // Generate timestamps
-       $START = mktime(postRequestParameter('start_hour'), postRequestParameter('start_min'), postRequestParameter('start_sec'), postRequestParameter('start_month'), postRequestParameter('start_day'), postRequestParameter('start_year'));
-       $END   = mktime(postRequestParameter('end_hour')  , postRequestParameter('end_min')  , postRequestParameter('end_sec')  , postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
+       $START = mktime(postRequestElement('start_hour'), postRequestElement('start_min'), postRequestElement('start_sec'), postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
+       $END   = mktime(postRequestElement('end_hour')  , postRequestElement('end_min')  , postRequestElement('end_sec')  , postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
 
        // Is there already a rallye running?
-       $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`,`admin_id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (`start_time` <= %s AND `end_time` >= %s) OR (`start_time` >= %s AND `start_time` <= %s) LIMIT 1",
                array($START, $START, $START, $END), __FILE__, __LINE__);
 
        if (SQL_HASZERONUMS($result)) {
                // Ok, start and end time did not overlap
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_data` (`admin_id`, `title`, `descr`, template, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`)
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_data` (`admin_id`,`title`,`descr`, template, `start_time`,`end_time`,`auto_add_new_user`,`is_active`,`send_notify`)
 VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
                        array(
                                getCurrentAdminId(),
-                               postRequestParameter('title'),
-                               postRequestParameter('descr'),
-                               postRequestParameter('template'),
+                               postRequestElement('title'),
+                               postRequestElement('descr'),
+                               postRequestElement('template'),
                                $START,
                                $END,
-                               postRequestParameter('auto_add'),
-                               postRequestParameter('active'),
-                               postRequestParameter('notify'),
+                               postRequestElement('auto_add'),
+                               postRequestElement('active'),
+                               postRequestElement('notify'),
                        ), __FILE__, __LINE__);
 
                // Load id
@@ -76,22 +76,17 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
                        redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye='.$id);
                } else {
                        // Problem detected...
-                       loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}');
+                       displayMessage('{--RALLYE_PROBLEM_CREATE--}');
                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}');
+               displayMessage('{--RALLYE_OVERLAP_TIMES--}');
        }
 } // END - if
 
-// Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array('{--NO--}' , '{--YES--}'));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
-
 // Starting day
 $content['start_sec']   = addSelectionBox('sec'  , 0                   , 'start');
 $content['start_min']   = addSelectionBox('min'  , 0                   , 'start');
@@ -111,9 +106,6 @@ $content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end');
 $content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
 $content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
 
-// Transfer (maybe found) templates into constant for the template
-$content['templates_selection'] = addReferalRallyeTemplateSelection();
-
 // Load template
 loadTemplate('admin_add_rallye', false, $content);