Way more usage of EL code:

[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 65abc76504b93fd9e585997d272411cde69c4d8f..751148967430062c94db7ddb0cc2c39b013defbd 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -63,18 +63,16 @@ 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')) {
                // Get timestamp from insert
-               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
-                       generateDateTime(getEpocheTimeFromUserStats('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);
@@ -102,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')) {
                // Get timestamp from insert
-               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
-                       generateDateTime(getEpocheTimeFromUserStats('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