Way more usage of EL 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 aa8bc4371be037f5d0ac93526e0d19425cf5f690..ace68d7486c53df9e5ac4378cd25809bff0c6712 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,7 +49,7 @@ 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)) {
@@ -76,16 +76,16 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
                        redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye='.$id);
                } else {
                        // Problem detected...
-                       loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}');
+                       displayMessage('{--RALLYE_PROBLEM_CREATE--}');
                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}');
+               displayMessage('{--RALLYE_OVERLAP_TIMES--}');
        }
-}
+} // END - if
 
 // Prepare some constants for the template
 $content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));