Huge rewrite:

[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 0bb32ca89dbd22e2a085d5059445c4aeeedb5171..4ad03f5172bf75f83becae8061862985839c145b 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -38,14 +38,14 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Generate timestamps
        $START = mktime(REQUEST_POST('start_hour'), REQUEST_POST('start_min'), REQUEST_POST('start_sec'), REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
        $END   = mktime(REQUEST_POST('end_hour')  , REQUEST_POST('end_min')  , REQUEST_POST('end_sec')  , REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
@@ -58,71 +58,71 @@ if (IS_FORM_SENT()) {
                // 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')",
- array(
-       GET_CURRENT_ADMIN_ID(),
-       REQUEST_POST('title'),
-       REQUEST_POST('descr'),
-       REQUEST_POST('template'),
-       $START,
-       $END,
-       REQUEST_POST('auto_add'),
-       REQUEST_POST('active'),
-       REQUEST_POST('notify'),
-), __FILE__, __LINE__);
+                       array(
+                               getCurrentAdminId(),
+                               REQUEST_POST('title'),
+                               REQUEST_POST('descr'),
+                               REQUEST_POST('template'),
+                               $START,
+                               $END,
+                               REQUEST_POST('auto_add'),
+                               REQUEST_POST('active'),
+                               REQUEST_POST('notify'),
+                       ), __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, REQUEST_POST('title')), __FILE__, __LINE__);
+               $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, REQUEST_POST('title')), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                if (!empty($id)) {
                        // Reload to prices...
-                       LOAD_URL("modules.php?module=admin&what=config_rallye_prices&rallye=".$id);
+                       redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye='.$id);
                } else {
                        // Problem detected...
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_PROBLEM_CREATE'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PROBLEM_CREATE'));
                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_OVERLAP_TIMES'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_OVERLAP_TIMES'));
        }
 }
 
 // Prepare some constants for the template
-define('_AUTO_ADD_OPTIONS', ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));
-define('_ACTIVE_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('N','Y'), array(NO , YES)));
-define('_NOTIFY_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));
+define('_AUTO_ADD_OPTIONS', generateOptionList('/ARRAY/', array('Y','N'), array(YES, NO )));
+define('_ACTIVE_OPTIONS'  , generateOptionList('/ARRAY/', array('N','Y'), array(NO , YES)));
+define('_NOTIFY_OPTIONS'  , generateOptionList('/ARRAY/', array('Y','N'), array(YES, NO )));
 
 // Starting day
-define('_START_SEC'  , ADD_SELECTION("sec"  , "0"              , "start"));
-define('_START_MIN'  , ADD_SELECTION("min"  , "0"              , "start"));
-define('_START_HOUR' , ADD_SELECTION("hour" , date("G", time()), "start"));
-define('_START_DAY'  , ADD_SELECTION("day"  , date("d", time()), "start"));
-define('_START_MONTH', ADD_SELECTION("month", date("m", time()), "start"));
-define('_START_YEAR' , ADD_SELECTION("year" , date('Y', time()), "start"));
+define('_START_SEC'  , ADD_SELECTION('sec'  , '0'              , 'start'));
+define('_START_MIN'  , ADD_SELECTION('min'  , '0'              , 'start'));
+define('_START_HOUR' , ADD_SELECTION('hour' , date('G', time()), 'start'));
+define('_START_DAY'  , ADD_SELECTION('day'  , date('d', time()), 'start'));
+define('_START_MONTH', ADD_SELECTION('month', date('m', time()), 'start'));
+define('_START_YEAR' , ADD_SELECTION('year' , date('Y', time()), 'start'));
 
 // Calcualte ending date
-$D = date("d", time() + (getConfig('one_day') * 7));
-$M = date("m", time() + (getConfig('one_day') * 7));
+$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 day
-define('_END_SEC'  , ADD_SELECTION("sec"  , "0"              , "end"));
-define('_END_MIN'  , ADD_SELECTION("min"  , "0"              , "end"));
-define('_END_HOUR' , ADD_SELECTION("hour" , date("G", time()), "end"));
-define('_END_DAY'  , ADD_SELECTION("day"  , $D               , "end"));
-define('_END_MONTH', ADD_SELECTION("month", $M               , "end"));
-define('_END_YEAR' , ADD_SELECTION("year" , $Y               , "end"));
+define('_END_SEC'  , ADD_SELECTION('sec'  , '0'              , 'end'));
+define('_END_MIN'  , ADD_SELECTION('min'  , '0'              , 'end'));
+define('_END_HOUR' , ADD_SELECTION('hour' , date('G', time()), 'end'));
+define('_END_DAY'  , ADD_SELECTION('day'  , $D               , 'end'));
+define('_END_MONTH', ADD_SELECTION('month', $M               , 'end'));
+define('_END_YEAR' , ADD_SELECTION('year' , $Y               , 'end'));
 
 // Transfer (maybe found) templates into constant for the template
 define('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());
 
 // Load template
-LOAD_TEMPLATE("admin_add_rallye");
+LOAD_TEMPLATE('admin_add_rallye');
 
 //
 ?>