Complete rewrite of and , wrapper functions added, see bug #101

[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 12798e889970eb523980b60d6f0bc647a8e8ec23..ccb2d887cbbed7acbb321fc1d534ea347be0a12d 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -40,52 +40,45 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (IS_FORM_SENT()) {
        // Generate timestamps
-       $START = mktime($_POST['start_hour'], $_POST['start_min'], $_POST['start_sec'], $_POST['start_month'], $_POST['start_day'], $_POST['start_year']);
-       $END   = mktime($_POST['end_hour']  , $_POST['end_min']  , $_POST['end_sec']  , $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
+       $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')  );
 
        // 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",
-        array($START, $START, $START, $END), __FILE__, __LINE__);
+               array($START, $START, $START, $END), __FILE__, __LINE__);
 
-       if (SQL_NUMROWS($result) == 0)
-       {
+       if (SQL_NUMROWS($result) == 0) {
                // 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(),
-       $_POST['title'],
-       $_POST['descr'],
-       $_POST['template'],
+       REQUEST_POST('title'),
+       REQUEST_POST('descr'),
+       REQUEST_POST('template'),
        $START,
        $END,
-       $_POST['auto_add'],
-       $_POST['active'],
-       $_POST['notify'],
+       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, $_POST['title']), __FILE__, __LINE__);
+                array($START, $END, REQUEST_POST('title')), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
-               if (!empty($id))
-               {
+               if (!empty($id)) {
                        // Reload to prices...
                        LOAD_URL("modules.php?module=admin&amp;what=config_rallye_prices&rallye=".$id);
-               }
-                else
-               {
+               } else {
                        // Problem detected...
                        LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PROBLEM_CREATE);
                }
-       }
-        else
-       {
+       } else {
                // Free memory
                SQL_FREERESULT($result);