X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_rallye.php;h=12798e889970eb523980b60d6f0bc647a8e8ec23;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;hp=1f831ca13bde8d24cdf8e7b97aa7010bf1add825;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 1f831ca13b..12798e8899 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 if (isset($_POST['ok']))
 {
@@ -47,16 +47,16 @@ 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)
-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(
-	GET_ADMIN_ID($_COOKIE['admin_login']),
+	GET_CURRENT_ADMIN_ID(),
 	$_POST['title'],
 	$_POST['descr'],
 	$_POST['template'],
@@ -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);
@@ -95,9 +95,9 @@ VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
 }
 
 // Prepare some constants for the template
-define('_AUTO_ADD_OPTIONS', ADD_OPTION_LINES("/ARRAY/", array('Y', 'N'), array(YES, NO )));
-define('_ACTIVE_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('N', 'Y'), array(NO , YES)));
-define('_NOTIFY_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('Y', 'N'), array(YES, NO )));
+define('_AUTO_ADD_OPTIONS', ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));
+define('_ACTIVE_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('N','Y'), array(NO , YES)));
+define('_NOTIFY_OPTIONS'  , ADD_OPTION_LINES("/ARRAY/", array('Y','N'), array(YES, NO )));
 
 // Starting day
 define('_START_SEC'  , ADD_SELECTION("sec"  , "0"              , "start"));
@@ -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() + (ONE_DAY * 7));
-$M = date("m", time() + (ONE_DAY * 7));
-$Y = date('Y', time() + (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"));
@@ -121,7 +121,7 @@ define('_END_MONTH', ADD_SELECTION("month", $M               , "end"));
 define('_END_YEAR' , ADD_SELECTION("year" , $Y               , "end"));
 
 // Transfer (maybe found) templates into constant for the template
-define ('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());
+define('_TEMPLATES', RALLYE_TEMPLATE_SELECTION());
 
 // Load template
 LOAD_TEMPLATE("admin_add_rallye");