More improved SQL queries

[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 12fb85f1fad13cdbb80da8bf8b17f57a04f542ed..3f32393e1036bb9626339166142d7a854d9d1300 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -47,13 +47,13 @@ if (isset($_POST['ok']))
        $END   = mktime($_POST['end_hour']  , $_POST['end_min']  , $_POST['end_sec']  , $_POST['end_month']  , $_POST['end_day']  , $_POST['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_NUMROWS($result) == 0)
        {
                // 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)
+               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(),
@@ -68,7 +68,7 @@ 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",
+               $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, $_POST['title']), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -108,9 +108,9 @@ 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() + ($_CONFIG['one_day'] * 7));
-$M = date("m", time() + ($_CONFIG['one_day'] * 7));
-$Y = date('Y', time() + ($_CONFIG['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"));