X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=1389c33d6abf03212bbd06436156cf4488b5860a;hb=4b93525eb57c07b89c127494a45ec3d5666fa71a;hp=8e7874f111e6f498c2922ef9e10231f7d993f85c;hpb=920d1ccdaddfed8cd1538e7449422eed2c425efe;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 8e7874f111..1389c33d6a 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,7 +43,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 // Shall we display a mail?
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
@@ -65,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')) {
+	// 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
@@ -103,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')) {
+	// 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
@@ -167,7 +162,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'];
@@ -181,7 +176,7 @@ LIMIT 1",
 
 		// Data found to this mail?
 		if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
-			// Mail was found!
+			// Mail was found
 			list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
 
 			// Subject line found?
@@ -259,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]