X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=fc92311e16b29b20164f84ee6ddb31e793187d3f;hb=8202991f32bfb2056e94a11746c0b5308fe4a273;hp=10c76eea900da06e9b223b983bca4cafac7010b6;hpb=4c221b6350439b8f91db58f142f03f79014f2eaf;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 10c76eea90..fc92311e16 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('holiday')) && (!isAdmin())) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('holiday'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=holiday%}');
 	return;
 } // END - if
 
@@ -86,8 +86,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 
 	if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
 		// Mail order is to close away!
-		unsetPostRequestParameter('ok');
-		unsetPostRequestParameter('stop');
+		unsetPostRequestElement('ok');
+		unsetPostRequestElement('stop');
 
 		if (($content['timestamp'] + getConfig('holiday_lock')) > time()) {
 			// Mail found in pool
@@ -98,7 +98,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 		}
 
 		// Display message and exit here
-		displayMessage(getMaskedMessage('MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, 1)));
+		displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}');
 		return;
 	}
 } // END - if
@@ -109,37 +109,38 @@ SQL_FREERESULT($result2);
 
 if (isFormSent()) {
 	// Check holiday request...
-	$START = mktime(0, 0, 0, postRequestParameter('start_month'), postRequestParameter('start_day'), postRequestParameter('start_year'));
-	$content['holiday_end']   = mktime(0, 0, 0, postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
+	$START = mktime(0, 0, 0, postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
+	$content['holiday_end']   = mktime(0, 0, 0, postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
 
 	// Test both values
 	$TEST = $content['holiday_end'] - $START;
 	if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
 		// Time test failed
-		unsetPostRequestParameter('ok');
+		unsetPostRequestElement('ok');
 	} else {
 		// Everything went okay so let's store his request and send mails
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')",
-			array(getMemberId(), $START, $content['holiday_end'], postRequestParameter('comments')), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`,`holiday_start`,`holiday_end`,`comments`) VALUES ('%s','%s','%s','%s')",
+			array(getMemberId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
 
 		// Activate holiday system
 		SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`holiday_active`='N', `holiday_activated`=UNIX_TIMESTAMP()
+	`holiday_active`='N',
+	`holiday_activated`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s
 LIMIT 1",
 			array(getMemberId()), __FILE__, __LINE__);
 
 		// Prepare constants
-		$content['start_day']   = bigintval(postRequestParameter('start_day'));
-		$content['start_month'] = $GLOBALS['month_descr'][postRequestParameter('start_month')];
-		$content['start_year']  = bigintval(postRequestParameter('start_year'));
-		$content['end_day']     = bigintval(postRequestParameter('end_day'));
-		$content['end_month']   = $GLOBALS['month_descr'][postRequestParameter('end_month')];
-		$content['end_year']    = bigintval(postRequestParameter('end_year'));
-		$content['comments']    = secureString(postRequestParameter('comments'));
+		$content['start_day']   = bigintval(postRequestElement('start_day'));
+		$content['start_month'] = $GLOBALS['month_descr'][postRequestElement('start_month')];
+		$content['start_year']  = bigintval(postRequestElement('start_year'));
+		$content['end_day']     = bigintval(postRequestElement('end_day'));
+		$content['end_month']   = $GLOBALS['month_descr'][postRequestElement('end_month')];
+		$content['end_year']    = bigintval(postRequestElement('end_year'));
+		$content['comments']    = postRequestElement('comments');
 
 		// Send mail to member
 		$message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
@@ -157,10 +158,10 @@ LIMIT 1",
 } // END - if
 
 // Holiday shall be ended now
-if (isPostRequestParameterSet('stop')) {
+if (isPostRequestElementSet('stop')) {
 	// Okay, end the holiday here...
 	$result = SQL_QUERY_ESC("SELECT
-	`holiday_active`, `holiday_activated`
+	`holiday_active`,`holiday_activated`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -175,7 +176,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 		if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
 			// Load data
 			$result2 = SQL_QUERY_ESC("SELECT
-	`holiday_start`, `holiday_end`
+	`holiday_start`,`holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -208,7 +209,7 @@ LIMIT 1",
 					array(getMemberId()), __FILE__, __LINE__);
 
 				// Send email to admin
-				sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
+				sendAdminNotification('{--ADMIN_HOLIDAY_DEACTIVATED_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
 				// Display message to user
 				displayMessage('{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}');
@@ -225,7 +226,7 @@ LIMIT 1",
 		}
 	} else {
 		// User not found
-		displayMessage(getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
+		displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
 	}
 
 	// Free result
@@ -233,10 +234,10 @@ LIMIT 1",
 } // END - if
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isFormSent()) && (!isPostRequestParameterSet('stop'))) {
+if ((!isFormSent()) && (!isPostRequestElementSet('stop'))) {
 	// Check if user is in holiday...
 	$result = SQL_QUERY_ESC("SELECT
-	`holiday_active`, `holiday_activated`
+	`holiday_active`,`holiday_activated`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -252,7 +253,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
 			case 'Y': // Display deactivation form
 				// Load starting and ending date
 				$result = SQL_QUERY_ESC("SELECT
-	`holiday_start`, `holiday_end`
+	`holiday_start`,`holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE