X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=751148967430062c94db7ddb0cc2c39b013defbd;hp=e593034a2ac6295ae0e97528ca1e2343f6e70cfd;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=c4823d28fd0bd22250b16d73f2034f36fc54abda

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index e593034a2a..7511489674 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -63,25 +63,24 @@ LIMIT 1",
 	// Translate some data
 	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
 	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
+	$content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user installed?
 	if (isExtensionInstalled('user')) {
 		// Get timestamp from insert
-		$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
-			generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
-		);
+		$content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), '2') . '%}';
 	} // END - if
 
 	// Display it depending on mail (data) type
-	loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
+	loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), false, $content);
 
 	// Free result
 	SQL_FREERESULT($result_data);
 } elseif (isGetRequestParameterSet('mailid')) {
 	// Display regular member mail by loading its full data
 	$result_data = SQL_QUERY_ESC("SELECT
-	s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
+	s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`,
+	s.cat_id, pay.price AS `points`, p.sender, pay.time, p.data_type
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
@@ -101,16 +100,14 @@ LIMIT 1",
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
+	$content['timestamp']   = generateDateTime($content['timestamp'], '2');
 	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
+	$content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user installed?
 	if (isExtensionInstalled('user')) {
 		// Get timestamp from insert
-		$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
-			generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-		);
+		$content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), '2') . '%}';
 	} // END - if
 
 	// Display it depending on mail (data) type
@@ -257,7 +254,7 @@ LIMIT 1",
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
+	displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]