X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=d9bf8ba0b22ffe68be6931ad9a0ccf2fb910ac5b;hb=701f5ac005404813e0e546102b5821f2ba2af522;hp=2df58e320cb409c3506d8f996ff6aada42c89fa9;hpb=43885129ac24cee5545a8a5ad51e90aa182fdf46;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 2df58e320c..d9bf8ba0b2 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -32,23 +32,18 @@
  ************************************************************************/
 
 // 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_LOGGED_IN())
-{
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
+} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Check for running mail orders in pool
 $result1 = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool
@@ -66,13 +61,13 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 	if (empty($stamp1)) $stamp1 = 0;
 	if (empty($stamp2)) $stamp2 = 0;
 
-	if ((($stamp1 + $_CONFIG['holiday_lock']) > time()) || (($stamp2 + $_CONFIG['holiday_lock']) > time()))
+	if ((($stamp1 + getConfig('holiday_lock')) > time()) || (($stamp2 + getConfig('holiday_lock')) > time()))
 	{
 		// Mail order is to close away!
 		unset($_POST['ok']);
 		unset($_POST['stop']);
 
-		if (($stamp1 + $_CONFIG['holiday_lock']) > time())
+		if (($stamp1 + getConfig('holiday_lock')) > time())
 		{
 			// Mail found in pool
 			$stamp = $stamp1;
@@ -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 > (getConfig('one_day') * getConfig('holiday_max'))) || ($START < time()) || ($END < time()))
 	{
 		// Time test failed
 		unset($_POST['ok']);
@@ -109,11 +104,11 @@ 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')",
+		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
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
 		 array($GLOBALS['userid']), __FILE__, __LINE__);
@@ -131,12 +126,11 @@ WHERE userid=%s LIMIT 1",
 		SEND_EMAIL($GLOBALS['userid'], HOLIDAY_MEMBER_SUBJECT, $msg);
 
 		// Send mail to all admins
-		$msg = LOAD_EMAIL_TEMPLATE("admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 		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())",
-		 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, addslashes($msg)), __FILE__, __LINE__);
+		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, $msg), __FILE__, __LINE__);
 
 		// Display message
 		LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_IS_ACTIVATED_NOW);
@@ -152,7 +146,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if (($active == "Y") && (($locked + $_CONFIG['holiday_lock']) < time()))
+	if (($active == "Y") && (($locked + getConfig('holiday_lock')) < time()))
 	{
 		// Load data
 		$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
@@ -168,16 +162,16 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			define('__HOLIDAY_END'  , MAKE_DATETIME($end  , "3"));
 
 			// Deactivate it now
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 			// Remove entry
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
 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);
@@ -205,12 +199,12 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	SQL_FREERESULT($result);
 
 	// Check for lock
-	if (($locked + $_CONFIG['holiday_lock']) < time())
+	if (($locked + getConfig('holiday_lock')) < time())
 	{
 		// User can deactivate his holiday request
 		switch ($active)
 		{
-		case 'Y': // Display deactivation form
+		case "Y": // Display deactivation form
 			// Load starting and ending date
 			$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
@@ -234,7 +228,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 				SQL_FREERESULT($result);
 
 				// Remove entry and reload URL
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 				LOAD_URL("modules.php?module=login&amp;what=holiday");
@@ -242,16 +236,16 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			}
 			break;
 
-		case 'N': // Display activation form
+		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() + getConfig('one_day'))), "start"));
+			define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + getConfig('one_day'))), "start"));
+			define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + getConfig('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() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
+			$M = date("m", time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
+			$Y = date('Y', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
 
 			// Ending day
 			define('_END_DAY'  , ADD_SELECTION("day"  , $D, "end"));
@@ -259,7 +253,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			define('_END_YEAR' , ADD_SELECTION("year" , $Y, "end"));
 
 			// Copy value from configuration
-			define('__HOLIDAY_MAX', $_CONFIG['holiday_max']);
+			define('__HOLIDAY_MAX', getConfig('holiday_max'));
 
 			// Output form
 			LOAD_TEMPLATE("member_holiday_form");