X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=e12ea8eb2bf3e6f304506421adc780f1180dc7c5;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hp=0679b212c177c77858bc501b8fa9b7e7f4ee1dd2;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 0679b212c1..e12ea8eb2b 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -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 *
@@ -41,15 +42,13 @@ if (!defined('__SECURITY')) {
 	die();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
-} elseif ((!isExtensionActive('mailid')) && (!isAdmin())) {
-	redirectToUrl('modules.php?module=login');
 }
 
 // Add description as navigation point
 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`
@@ -58,7 +57,7 @@ FROM
 WHERE
 	`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestParameter('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
@@ -73,7 +72,7 @@ LIMIT 1",
 	$content['userid']    = getMemberId();
 
 	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
+	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
 		generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
 	);
 
@@ -82,7 +81,7 @@ LIMIT 1",
 
 	// 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
@@ -99,7 +98,7 @@ 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);
@@ -112,7 +111,7 @@ LIMIT 1",
 	$content['userid']    = getMemberId();
 
 	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
+	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
 		generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
 	);