X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=12ecfd5da861333b2b2eda5a701fd4ddd9f8c860;hb=c26fc70114d95f81368b82b0bab77285dabcb1d9;hp=eb3cd2fd4cfb39da59ad45c79046fd8aaa9c94c4;hpb=566cbcf381d60410b4c5b3a2fc4cd7bfdf49b8fc;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index eb3cd2fd4c..12ecfd5da8 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestätigte Mails                              *
+ * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,43 +48,42 @@ if (!defined('__SECURITY')) {
 addMenuDescription('member', __FILE__);
 
 // Shall we display a mail?
-if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('bonus'))) {
+if ((isGetRequestParameterSet('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` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
 	`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestParameter('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp'] = generateDateTime($content['timestamp'], 2);
-	$content['category']  = getCategory($content['cat_id']);
-	$content['points']    = translateComma($content['points']);
-	$content['is_notify'] = translateYesNo($content['is_notify']);
-	$content['sender']    = getMessage('USERNAME_ADMIN_SHORT');
-	$content['time']      = createFancyTime($content['time']);
-	$content['userid']    = getMemberId();
-
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
-		generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
-	);
+	$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(getTimestampFromUserStats('bonusid', $content['id']), 2)
+		);
+	} // END - if
 
 	// Display it depending on mail (data) type
 	loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
 
 	// Free result
 	SQL_FREERESULT($result_data);
-} elseif (isGetRequestElementSet(('mailid'))) {
+} 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 AS `category`, pay.price AS points, p.sender, pay.time, p.data_type
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
@@ -97,22 +97,23 @@ ON
 WHERE
 	s.id=%s
 LIMIT 1",
-		array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp'] = generateDateTime($content['timestamp'], 2);
-	$content['category']  = getCategory($content['cat_id']);
-	$content['points']    = translateComma($content['points']);
-	$content['time']      = createFancyTime($content['time']);
-	$content['userid']    = getMemberId();
-
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-		generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-	);
+	$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(getTimestampFromUserStats('mailid', $content['id']), 2)
+		);
+	} // END - if
 
 	// Display it depending on mail (data) type
 	loadTemplate('member_mail_normal_'.strtolower($content['data_type']), false, $content);
@@ -210,8 +211,7 @@ LIMIT 1",
 				'subject'   => $subject,
 				'sender'    => $sender,
 				'timestamp' => generateDateTime($timestamp, 2),
-				'cat'       => getCategory($cat),
-				'points'    => translateComma($pay),
+				'points'    => $pay,
 			);
 
 			// Load row template
@@ -250,7 +250,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Remember total points
-	$content['total_points'] = translateComma($sum);
+	$content['total_points'] = $sum;
 
 	// Remember all generated rows in constant for the template
 	$content['rows'] = $OUT;