X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=b3fb7f1fa6d37a6dc6ab579a5efa9c32060b31dc;hb=305141b6b5b656e0fb10505e5ae66fdc0ce2e391;hp=f04859845b9e1099e490fa7061c4d020f5a01cbb;hpb=19d5bac86427b5f0abe5a88a21b551b941488487;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index f04859845b..b3fb7f1fa6 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -166,7 +166,7 @@ WHERE
 	if ($notify == 'Y') $templ = 'admin_rallye_notify';
 
 	// Send email to admin
-	sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices);
+	sendAdminNotification('{%message,RALLYE_ADMIN_NOTIFY=' . $title . '%}', $templ, $prices);
 
 	// Free memory
 	SQL_FREERESULT($result_user);
@@ -211,7 +211,7 @@ ORDER BY
 		SQL_FREERESULT($result_prices);
 	} else {
 		// No prices???
-		$prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
+		$prices = '{%message,RALLYE_MEMBER_NO_PRICES=' . $mode . '%}';
 	}
 
 	// Add last line for email mode
@@ -546,7 +546,7 @@ function markReferalRallyesAsExpired ($result) {
 	}
 
 	// Send mail to admin
-	sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $count);
+	sendAdminNotification('{%message,RALLYE_ADMIN_EXPIRED_SUBJECT=' . $title . '%}', $templ, $count);
 
 	// Add task (we ignore the task id here)
 	createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -782,12 +782,12 @@ WHERE
 		// Expire found rallyes and notify admin
 		while ($content = SQL_FETCHARRAY($result_rallye)) {
 			// Prepare data for mail template
-			$content['start_time']  = generateDateTime($content['start_time'], 1);
-			$content['end_time']    = generateDateTime($content['end_time']  , 1);
-			$content['now_time']    = generateDateTime(time(), 1);
+			$content['start_time'] = generateDateTime($content['start_time'], 1);
+			$content['end_time']   = generateDateTime($content['end_time']  , 1);
+			$content['now_time']   = generateDateTime(time(), 1);
 
 			// Send mail to admin
-			sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content);
+			sendAdminNotification('{%message,RALLYE_ADMIN_PURGED_SUBJECT=' . $content['title'] . '%}', 'admin_rallye_purged', $content);
 
 			// Purge whole rallye
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
@@ -931,7 +931,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 
 	if ($min_users > 0) {
 		// Rallye ends when X members are totally in your exchange
-		$return = getMaskedMessage('RALLYE_END_USERS', $min_users);
+		$return = '{%message,RALLYE_END_USERS=' . $min_users . '%}';
 	} // END - if
 
 	// Return
@@ -945,7 +945,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 
 	if ($min_prices > 0) {
 		// Rallye ends when X members are totally in your exchange
-		$return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
+		$return = '{%message,RALLYE_END_PRICES=' . $min_prices . '%}';
 	} // END - if
 
 	// Return