Renamed function so it might be more understandable

[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 0cb4d2e5aed861f8f4a74c3ca1ca2fe20e73ae7a..aa8bc4371be037f5d0ac93526e0d19425cf5f690 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,10 +38,10 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
        // Generate timestamps
@@ -56,8 +54,8 @@ if (isFormSent()) {
 
        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)
-VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+               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'),
@@ -71,52 +69,47 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                        ), __FILE__, __LINE__);
 
                // Load id
-               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND `title`='%s' LIMIT 1",
-               array($START, $END, postRequestParameter('title')), __FILE__, __LINE__);
-               list($id) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $id = SQL_INSERTID();
 
                if (!empty($id)) {
                        // Reload to prices...
                        redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye='.$id);
                } else {
                        // Problem detected...
-                       loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PROBLEM_CREATE'));
+                       loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}');
                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_OVERLAP_TIMES'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}');
        }
 }
 
 // Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , getMessage('YES')));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
+$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');
-$content['start_hour']  = addSelectionBox('hour' , date('G', time()), 'start');
-$content['start_day']   = addSelectionBox('day'  , date('d', time()), 'start');
-$content['start_month'] = addSelectionBox('month', date('m', time()), 'start');
-$content['start_year']  = addSelectionBox('year' , date('Y', time()), 'start');
+$content['start_sec']   = addSelectionBox('sec'  , 0                   , 'start');
+$content['start_min']   = addSelectionBox('min'  , 0                   , 'start');
+$content['start_hour']  = addSelectionBox('hour' , getShortHour()      , 'start');
+$content['start_day']   = addSelectionBox('day'  , getDay()            , 'start');
+$content['start_month'] = addSelectionBox('month', getMonth()          , 'start');
+$content['start_year']  = addSelectionBox('year' , getYear()           , 'start');
 
-// Calcualte ending date
-$D = date('d', time() + (getConfig('ONE_DAY') * 7));
-$M = date('m', time() + (getConfig('ONE_DAY') * 7));
-$Y = date('Y', time() + (getConfig('ONE_DAY') * 7));
+// Ending timestamp
+$endingStamp = time() + (getOneDay() * 7);
 
 // Ending day
-$content['end_sec']   = addSelectionBox('sec'  , 0              , 'end');
-$content['end_min']   = addSelectionBox('min'  , 0              , 'end');
-$content['end_hour']  = addSelectionBox('hour' , date('G', time()), 'end');
-$content['end_day']   = addSelectionBox('day'  , $D               , 'end');
-$content['end_month'] = addSelectionBox('month', $M               , 'end');
-$content['end_year']  = addSelectionBox('year' , $Y               , 'end');
+$content['end_sec']   = addSelectionBox('sec'  , 0                     , 'end');
+$content['end_min']   = addSelectionBox('min'  , 0                     , 'end');
+$content['end_hour']  = addSelectionBox('hour' , getShortHour()        , 'end');
+$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();