Fixes for old-lost code

[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 22bfb3beaee3a5f2e97f834bcd797d883cd12b6e..aafcac4b0dfa4f758e165f7c2cc0ecfb808c1d96 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -49,12 +49,12 @@ if (isFormSent()) {
        $END   = mktime(postRequestParameter('end_hour')  , postRequestParameter('end_min')  , postRequestParameter('end_sec')  , postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('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(),
@@ -87,11 +87,6 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
        }
 } // 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);