Extensions fixed/improved:

[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 2cad2b449d48c892b095099c379141d9795fa742..af971c9247ccee4f912790b756a10121bcf05c03 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -45,6 +45,12 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Essential extension ext-mailid must be active
+if (!isExtensionActive('mailid')) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
+       return;
+} // END - if
+
 // Shall we display a mail?
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
@@ -61,20 +67,27 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $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)
-               );
+       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+       $content['userid'] = getMemberId();
+       $content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+       // Is ext-user active?
+       if (isExtensionActive('user')) {
+               // Default is never confirmed
+               $content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+               // Get the timestamp from the mail
+               $confirmedStamp = getEpocheTimeFromUserStats('bonusid', $content['id']);
+
+               // Have confirmed it?
+               if ($confirmedStamp > 0) {
+                       // Get timestamp from insert
+                       $content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+               } // END - if
        } // 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 +115,23 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $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)
-               );
+       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+       $content['userid'] = getMemberId();
+       $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+       // Is ext-user active?
+       if (isExtensionActive('user')) {
+               // Default is never confirmed
+               $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+               // Get the timestamp from the mail
+               $confirmedStamp = getEpocheTimeFromUserStats('mailid', $content['id']);
+
+               // Have confirmed it?
+               if ($confirmedStamp > 0) {
+                       // Get timestamp from insert
+                       $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+               } // END - if
        } // END - if
 
        // Display it depending on mail (data) type
@@ -174,7 +194,7 @@ LIMIT 1",
                                break;
 
                        default: // Unknown type detected!
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
                                break;
                }