X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=f44ea6a6b8dbdea48d33ffaacae6618eafba82f5;hp=0a840a1882396fc57e95b2d34ff949bca0cecab4;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hpb=3c4fbc22e3c04348734182d4d29bfef7eb050aa6

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 0a840a1882..f44ea6a6b8 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "holiday");
 	return;
 }
 
@@ -46,11 +46,11 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Check for running mail orders in pool
-$result1 = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool
+$result1 = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats
-$result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM "._MYSQL_PREFIX."_user_stats
+$result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM `{!_MYSQL_PREFIX!}_user_stats`
 WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
@@ -61,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']);
+		REQUEST_UNSET_POST('ok');
+		REQUEST_UNSET_POST(('stop'));
 
-		if (($stamp1 + $_CONFIG['holiday_lock']) > time())
+		if (($stamp1 + getConfig('holiday_lock')) > time())
 		{
 			// Mail found in pool
 			$stamp = $stamp1;
@@ -88,48 +88,48 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 
-if (isset($_POST['ok']))
+if (IS_FORM_SENT())
 {
 	// Check holiday request...
-	$START = mktime(0, 0, 0, $_POST['start_month'], $_POST['start_day'], $_POST['start_year']);
-	$END   = mktime(0, 0, 0, $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
+	$START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
+	$END   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
 
 	// Test both values
 	$TEST = $END - $START;
-	if (($TEST < 0) || ($TEST > ($_CONFIG['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']);
+		REQUEST_UNSET_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')",
-		 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
+		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, REQUEST_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__);
 
 		// Prepare constants
-		define('_START_DAY'  , $_POST['start_day']);
-		define('_START_MONTH', $MONTH_DESCR[$_POST['start_month']]);
-		define('_START_YEAR' , $_POST['start_year']);
-		define('_END_DAY'    , $_POST['end_day']);
-		define('_END_MONTH'  , $MONTH_DESCR[$_POST['end_month']]);
-		define('_END_YEAR'   , $_POST['end_year']);
+		define('_START_DAY'  , REQUEST_POST('start_day'));
+		define('_START_MONTH', $MONTH_DESCR[REQUEST_POST('start_month')]);
+		define('_START_YEAR' , REQUEST_POST('start_year'));
+		define('_END_DAY'    , REQUEST_POST('end_day'));
+		define('_END_MONTH'  , $MONTH_DESCR[REQUEST_POST('end_month')]);
+		define('_END_YEAR'   , REQUEST_POST('end_year'));
 
 		// Send mail to member
-		$msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", $_POST['comments'], $GLOBALS['userid']);
+		$msg = LOAD_EMAIL_TEMPLATE("member_holiday_request", REQUEST_POST('comments'), $GLOBALS['userid']);
 		SEND_EMAIL($GLOBALS['userid'], HOLIDAY_MEMBER_SUBJECT, $msg);
 
 		// Send mail to all admins
-		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
+		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", 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())",
+		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
@@ -138,18 +138,18 @@ WHERE userid=%s LIMIT 1",
 }
 
 // Holiday shall be ended now
-if (isset($_POST['stop']))
+if (REQUEST_ISSET_POST(('stop')))
 {
 	// Okay, end the holiday here...
-	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM "._MYSQL_PREFIX."_user_data
+	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 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
+		$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
@@ -162,12 +162,12 @@ 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
@@ -190,23 +190,23 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isset($_POST['ok'])) && (!isset($_POST['stop'])))
+if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST(('stop'))))
 {
 	// Check if user is in holiday...
-	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM "._MYSQL_PREFIX."_user_data
+	$result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 	list($active, $locked) = SQL_FETCHROW($result);
 	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
+			$result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
@@ -228,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");
@@ -236,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() + $_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"));
+			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() + $_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']));
+			$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"));
@@ -253,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");