- Surfbar further extended, currently broken!

[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 0aa241dd93ad18e07477a0fb5712aae0c6974139..1eb0f2f44879818f9c17b18d817311e0f6497414 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
@@ -54,9 +54,9 @@ if (isset($_POST['ok']))
        {
                // Ok, start and end time did not overlap
                $result = 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')",
+VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
  array(
-       GET_ADMIN_ID($_COOKIE['admin_login']),
+       GET_ADMIN_ID(get_session('admin_login')),
        $_POST['title'],
        $_POST['descr'],
        $_POST['template'],
@@ -76,7 +76,7 @@ VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
                if (!empty($id))
                {
                        // Reload to prices...
-                       LOAD_URL(URL."/modules.php?module=admin&what=config_rallye_prices&rallye=".$id);
+                       LOAD_URL("modules.php?module=admin&what=config_rallye_prices&rallye=".$id);
                }
                 else
                {
@@ -95,9 +95,9 @@ VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
 }
 
 // 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', 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 )));
 
 // Starting day
 define('_START_SEC'  , ADD_SELECTION("sec"  , "0"              , "start"));
@@ -105,12 +105,12 @@ 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_YEAR' , ADD_SELECTION("year" , date('Y', time()), "start"));
 
 // Calcualte ending date
-$D = date("d", time() + (ONE_DAY * 7));
-$M = date("m", time() + (ONE_DAY * 7));
-$Y = date("Y", time() + (ONE_DAY * 7));
+$D = date("d", time() + ($_CONFIG['one_day'] * 7));
+$M = date("m", time() + ($_CONFIG['one_day'] * 7));
+$Y = date('Y', time() + ($_CONFIG['one_day'] * 7));
 
 // Ending day
 define('_END_SEC'  , ADD_SELECTION("sec"  , "0"              , "end"));
@@ -121,7 +121,7 @@ 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());
+define('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());
 
 // Load template
 LOAD_TEMPLATE("admin_add_rallye");