X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_rallye.php;h=608b557b07fe161756834e3813f8bd746ff8cacb;hb=4b9887f734067dc52a1730468e25ba066036a3e1;hp=d4346aa5e9e22434b0008dd2155a0c33b1930a42;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index d4346aa5e9..608b557b07 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -54,10 +54,10 @@ if (isFormSent()) {
 	$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') {
+	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`)
+VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
 			array(
 				getCurrentAdminId(),
 				postRequestParameter('title'),
@@ -71,52 +71,47 @@ 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",
-		array($START, $END, postRequestParameter('title')), __FILE__, __LINE__);
-		list($id) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$id = SQL_INSERTID();
 
 		if (!empty($id)) {
 			// Reload to prices...
 			redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye='.$id);
 		} else {
 			// Problem detected...
-			loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PROBLEM_CREATE'));
+			loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}');
 		}
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Overlapping detected
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_OVERLAP_TIMES'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}');
 	}
 }
 
 // Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , getMessage('YES')));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
+$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
+$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array('{--NO--}' , '{--YES--}'));
+$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array('{--YES--}', '{--NO--}' ));
 
 // Starting day
-$content['start_sec']   = addSelectionBox('sec'  , 0              , 'start');
-$content['start_min']   = addSelectionBox('min'  , 0              , 'start');
-$content['start_hour']  = addSelectionBox('hour' , date('G', time()), 'start');
-$content['start_day']   = addSelectionBox('day'  , date('d', time()), 'start');
-$content['start_month'] = addSelectionBox('month', date('m', time()), 'start');
-$content['start_year']  = addSelectionBox('year' , date('Y', time()), 'start');
+$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');
 
-// Calcualte ending date
-$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 timestamp
+$endingStamp = time() + (getConfig('ONE_DAY') * 7);
 
 // Ending day
-$content['end_sec']   = addSelectionBox('sec'  , 0              , 'end');
-$content['end_min']   = addSelectionBox('min'  , 0              , 'end');
-$content['end_hour']  = addSelectionBox('hour' , date('G', time()), 'end');
-$content['end_day']   = addSelectionBox('day'  , $D               , 'end');
-$content['end_month'] = addSelectionBox('month', $M               , 'end');
-$content['end_year']  = addSelectionBox('year' , $Y               , 'end');
+$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');
 
 // Transfer (maybe found) templates into constant for the template
 $content['templates_selection'] = addReferalRallyeTemplateSelection();