Code moved because it depends on tables created by ext-user

[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 6b74bacc480c89da6ff0f268506a9c3eb03442b0..d5a2b824d8c93acf9c8c70b30c59766c6286035c 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ===============                              Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/19/2003 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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,31 +57,35 @@ 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);
 
        // 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['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();
+       $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
@@ -99,7 +102,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);
@@ -110,11 +113,15 @@ LIMIT 1",
        $content['points']    = translateComma($content['points']);
        $content['time']      = createFancyTime($content['time']);
        $content['userid']    = getMemberId();
+       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
 
-       // Get timestamp from insert
-       $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-               generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-       );
+       // 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);
@@ -205,15 +212,15 @@ LIMIT 1",
 
                        // Prepare data for template
                        $content = array(
-                               'sw'      => $SW,
-                               'userid'  => getMemberId(),
-                               'data'    => bigintval($DATA),
-                               'type'    => $type,
-                               'subject' => $subject,
-                               'sender'  => $sender,
-                               'stamp'   => generateDateTime($timestamp, 2),
-                               'cat'     => getCategory($cat),
-                               'points'  => translateComma($pay),
+                               'sw'        => $SW,
+                               'userid'    => getMemberId(),
+                               'data'      => bigintval($DATA),
+                               'type'      => $type,
+                               'subject'   => $subject,
+                               'sender'    => $sender,
+                               'timestamp' => generateDateTime($timestamp, 2),
+                               'cat'       => getCategory($cat),
+                               'points'    => translateComma($pay),
                        );
 
                        // Load row template