fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / member / what-unconfirmed.php

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 0679b212c177c77858bc501b8fa9b7e7f4ee1dd2..0bfc2e3a0c84817e978433a1fc3fda4dff0e877d 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -41,15 +41,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 +56,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 +71,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 +80,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 +97,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 +110,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)
        );