X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=dd7c7a5731a09efe7ce123892af608a53e89301f;hb=ae2999848b6868bea711760789614c341c8cced3;hp=46baf1cd6406586921385c357f5bc8d99173ba7f;hpb=90ea643fa8c32b94f6f5ed636730d87eb31bba6b;p=mailer.git

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 46baf1cd64..dd7c7a5731 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('holiday')) && (!isAdmin())) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('holiday'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=holiday%}');
 	return;
 } // END - if
 
@@ -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
@@ -119,7 +119,7 @@ if (isFormSent()) {
 		unsetPostRequestParameter('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')",
+		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__);
 
 		// Activate holiday system
@@ -160,7 +160,7 @@ LIMIT 1",
 if (isPostRequestParameterSet('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 +175,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 +208,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 +225,7 @@ LIMIT 1",
 		}
 	} else {
 		// User not found
-		displayMessage(getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
+		displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
 	}
 
 	// Free result
@@ -236,7 +236,7 @@ LIMIT 1",
 if ((!isFormSent()) && (!isPostRequestParameterSet('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 +252,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