X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=88d8408cda57da357bb2b3c033d4f4c7f9708a76;hb=0a37fc5afcd828646d4e62e68fea07c3d2c54a87;hp=65abc76504b93fd9e585997d272411cde69c4d8f;hpb=c92182154b4dcd68c2efff0bf0ff863cabd8d9de;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 65abc76504..88d8408cda 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.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 *
@@ -45,40 +45,53 @@ 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'))) {
+if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('bonus'))) {
 	// Display bonus mail by loading it's full data
 	$result_data = SQL_QUERY_ESC("SELECT
-	`id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+	`id`,`subject`,`timestamp`,`cat_id`,`points`,`text`,`is_notify`,`data_type`,`time`,`url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
 	`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('bonusid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
-	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('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(getEpocheTimeFromUserStats('bonusid', $content['id']), 2)
-		);
+	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
+	$content['userid'] = getMemberId();
+	$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+	// Is ext-user active?
+	if (isExtensionActive('user')) {
+		// Default is never confirmed
+		$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+		// Get the timestamp from the mail
+		$confirmedStamp = getEpocheTimeFromUserStats('bonusid', $content['id']);
+
+		// Have confirmed it?
+		if ($confirmedStamp > 0) {
+			// Get timestamp from insert
+			$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+		} // END - if
 	} // 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')) {
+} elseif (isGetRequestElementSet('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`,
@@ -96,22 +109,29 @@ ON
 WHERE
 	s.id=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
-	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('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(getEpocheTimeFromUserStats('mailid', $content['id']), 2)
-		);
+	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
+	$content['userid'] = getMemberId();
+	$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+	// Is ext-user active?
+	if (isExtensionActive('user')) {
+		// Default is never confirmed
+		$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+		// Get the timestamp from the mail
+		$confirmedStamp = getEpocheTimeFromUserStats('mailid', $content['id']);
+
+		// Have confirmed it?
+		if ($confirmedStamp > 0) {
+			// Get timestamp from insert
+			$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+		} // END - if
 	} // END - if
 
 	// Display it depending on mail (data) type
@@ -123,11 +143,11 @@ LIMIT 1",
 
 if (isExtensionActive('bonus')) {
 	// Load bonus id
-	$result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
+	$result = SQL_QUERY_ESC("SELECT `stats_id`,`bonus_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
 		array(getMemberId()), __FILE__, __LINE__);
 } else {
 	// Don't load bonus id if ext-bonus is not installed
-	$result = SQL_QUERY_ESC("SELECT `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
+	$result = SQL_QUERY_ESC("SELECT `stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
 		array(getMemberId()), __FILE__, __LINE__);
 }
 
@@ -166,7 +186,7 @@ LIMIT 1",
 				break;
 
 			case 'BONUS':
-				$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result_data = SQL_QUERY_ESC("SELECT `subject`,`timestamp`,`cat_id`,`points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
 				$row['link_type'] = 'bonusid';
 				$data = $row['bonus_id'];
@@ -174,7 +194,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;
 		}