X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_rallye.php;h=431d4ccf31d078acf17185d1f0ef838d98da2d76;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=8286c6e260d8bbe28c22b9c60e85a7e9edcdb8c1;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 8286c6e260..431d4ccf31 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,17 +45,42 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
 	// Generate timestamps
-	$START = mktime(postRequestElement('start_hour'), postRequestElement('start_min'), postRequestElement('start_sec'), postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
-	$END   = mktime(postRequestElement('end_hour')  , postRequestElement('end_min')  , postRequestElement('end_sec')  , postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
+	$START = mktime(postRequestElement('start_time_hour'), postRequestElement('start_time_min'), 0, postRequestElement('start_time_month'), postRequestElement('start_time_day'), postRequestElement('start_time_year'));
+	$END   = mktime(postRequestElement('end_time_hour')  , postRequestElement('end_time_min')  , 0, postRequestElement('end_time_month')  , postRequestElement('end_time_day')  , postRequestElement('end_time_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)) {
 		// 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')",
+		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`,
+	`min_users`,
+	`min_prices`
+) VALUES (
+	%s,
+	'%s',
+	'%s',
+	'%s',
+	%s,
+	%s,
+	'%s',
+	'%s',
+	'%s',
+	%s,
+	%s
+)",
 			array(
 				getCurrentAdminId(),
 				postRequestElement('title'),
@@ -66,6 +91,8 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
 				postRequestElement('auto_add'),
 				postRequestElement('active'),
 				postRequestElement('notify'),
+				bigintval(postRequestElement('min_users')),
+				bigintval(postRequestElement('min_prices'))
 			), __FILE__, __LINE__);
 
 		// Load id
@@ -73,41 +100,40 @@ VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
 
 		if (!empty($id)) {
 			// Reload to prices...
-			redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye='.$id);
+			redirectToUrl('modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=' . bigintval($id));
 		} else {
 			// Problem detected...
-			displayMessage('{--RALLYE_PROBLEM_CREATE--}');
+			displayMessage('{--ADMIN_RALLYE_PROBLEM_CREATE--}');
 		}
 	} else {
-		// Free memory
-		SQL_FREERESULT($result);
 
 		// Overlapping detected
-		displayMessage('{--RALLYE_OVERLAP_TIMES--}');
+		displayMessage('{--ADMIN_RALLYE_OVERLAP_TIMES--}');
 	}
+
+	// Free memory
+	SQL_FREERESULT($result);
 } // END - if
 
 // Starting day
-$content['start_sec']   = addSelectionBox('sec'  , 0                   , 'start');
-$content['start_min']   = addSelectionBox('min'  , 0                   , 'start');
-$content['start_hour']  = addSelectionBox('hour' , getShortHour()      , 'start');
-$content['start_day']   = addSelectionBox('day'  , getDay()            , 'start');
-$content['start_month'] = addSelectionBox('month', getMonth()          , 'start');
-$content['start_year']  = addSelectionBox('year' , getYear()           , 'start');
+$content['start_min']   = addSelectionBox('min'  , 0                   , 'start_time');
+$content['start_hour']  = addSelectionBox('hour' , getShortHour()      , 'start_time');
+$content['start_day']   = addSelectionBox('day'  , getDay()            , 'start_time');
+$content['start_month'] = addSelectionBox('month', getMonth()          , 'start_time');
+$content['start_year']  = addSelectionBox('year' , getYear()           , 'start_time');
 
 // Ending timestamp
 $endingStamp = time() + (getOneDay() * 7);
 
 // Ending day
-$content['end_sec']   = addSelectionBox('sec'  , 0                     , 'end');
-$content['end_min']   = addSelectionBox('min'  , 0                     , 'end');
-$content['end_hour']  = addSelectionBox('hour' , getShortHour()        , 'end');
-$content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end');
-$content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end');
-$content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end');
+$content['end_min']   = addSelectionBox('min'  , 0                     , 'end_time');
+$content['end_hour']  = addSelectionBox('hour' , getShortHour()        , 'end_time');
+$content['end_day']   = addSelectionBox('day'  , getDay($endingStamp)  , 'end_time');
+$content['end_month'] = addSelectionBox('month', getMonth($endingStamp), 'end_time');
+$content['end_year']  = addSelectionBox('year' , getYear($endingStamp) , 'end_time');
 
 // Load template
-loadTemplate('admin_add_rallye', false, $content);
+loadTemplate('admin_add_rallye', FALSE, $content);
 
 // [EOF]
 ?>