X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=2d1d2685680fa57fbfcc8cfcc0768298869ce907;hp=800ee5a0c3248e98f5b31fef4e537c2c4935219f;hb=2cce06a4f4ff6bdbf0a14dcf7d2a89944b472c69;hpb=fe4e98d8332bf21b9bee633ecbf79687cfd11f80

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 800ee5a0c3..2d1d268568 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -32,17 +32,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif (!IS_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
 	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
 	return;
 }
@@ -101,7 +96,7 @@ if (isset($_POST['ok']))
 
 	// Test both values
 	$TEST = $END - $START;
-	if (($TEST < 0) || ($TEST > (ONE_DAY * $_CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
+	if (($TEST < 0) || ($TEST > ($_CONFIG['one_day'] * $_CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
 	{
 		// Time test failed
 		unset($_POST['ok']);
@@ -109,7 +104,7 @@ if (isset($_POST['ok']))
 	 else
 	{
 		// Everything went okay so let's store his request and send mails
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_holidays (userid, holiday_start, holiday_end, comments) VALUES ('%s', '%s', '%s', '%s')",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_holidays (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",
 		 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
 
 		// Activate holiday system
@@ -134,7 +129,7 @@ WHERE userid=%s LIMIT 1",
 		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
 		// Create task
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'HOLIDAY_REQUEST', '%s', '%s', UNIX_TIMESTAMP())",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','%s','%s', UNIX_TIMESTAMP())",
 		 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, addslashes($msg)), __FILE__, __LINE__);
 
 		// Display message
@@ -176,7 +171,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 			// Send email to admin
-			SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
+			SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", array(), $GLOBALS['userid']);
 
 			// Display message to user
 			LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);
@@ -243,14 +238,14 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 		case 'N': // Display activation form
 			// Starting day
-			define('_START_DAY'  , ADD_SELECTION("day"  , date("d", (time() + ONE_DAY)), "start"));
-			define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + ONE_DAY)), "start"));
-			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + ONE_DAY)), "start"));
+			define('_START_DAY'  , ADD_SELECTION("day"  , date("d", (time() + $_CONFIG['one_day'])), "start"));
+			define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + $_CONFIG['one_day'])), "start"));
+			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + $_CONFIG['one_day'])), "start"));
 
 			// Calcualte ending date
-			$D = date("d", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
-			$M = date("m", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
-			$Y = date('Y', time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
+			$D = date("d", time() + $_CONFIG['one_day'] + ($_CONFIG['one_day'] * $_CONFIG['holiday_max']));
+			$M = date("m", time() + $_CONFIG['one_day'] + ($_CONFIG['one_day'] * $_CONFIG['holiday_max']));
+			$Y = date('Y', time() + $_CONFIG['one_day'] + ($_CONFIG['one_day'] * $_CONFIG['holiday_max']));
 
 			// Ending day
 			define('_END_DAY'  , ADD_SELECTION("day"  , $D, "end"));