X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=b49e1031e230266815c54b42fa12ea0621480c08;hb=1972cc4b6538e319712a70421f1d311decfc8bf9;hp=9f06817864c1db879a0345c6bebec93eb41712ff;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 9f06817864..b49e1031e2 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -45,6 +45,12 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Essential extension ext-mailid must be active
+if (!isExtensionActive('mailid')) {
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
+	return;
+} // END - if
+
 // Shall we display a mail?
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
 	// Display bonus mail by loading it's full data
@@ -63,25 +69,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')) {
+	// Is ext-user active?
+	if (isExtensionActive('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 +106,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')) {
+	// Is ext-user active?
+	if (isExtensionActive('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
@@ -173,7 +176,7 @@ LIMIT 1",
 				break;
 
 			default: // Unknown type detected!
-				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+				debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
 				break;
 		}