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 91691d58adf4ff340f7720fb000b4705d975892e..0bfc2e3a0c84817e978433a1fc3fda4dff0e877d 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                             *
@@ -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);
@@ -68,12 +66,12 @@ LIMIT 1",
        $content['category']  = getCategory($content['cat_id']);
        $content['points']    = translateComma($content['points']);
        $content['is_notify'] = translateYesNo($content['is_notify']);
-       $content['sender']    = getMessage('_ADMIN_SHORT');
+       $content['sender']    = getMessage('USERNAME_ADMIN_SHORT');
        $content['time']      = createFancyTime($content['time']);
-       $content['userid']    = getUserId();
+       $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);
@@ -109,10 +107,10 @@ LIMIT 1",
        $content['category']  = getCategory($content['cat_id']);
        $content['points']    = translateComma($content['points']);
        $content['time']      = createFancyTime($content['time']);
-       $content['userid']    = getUserId();
+       $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)
        );
 
@@ -124,19 +122,19 @@ LIMIT 1",
 }
 
 if (isExtensionActive('bonus')) {
-       // Load bonus ID
+       // Load bonus id
        $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
-               array(getUserId()), __FILE__, __LINE__);
+               array(getMemberId()), __FILE__, __LINE__);
 } else {
-       // Don't load bonus ID
+       // Don't load bonus id
        $result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
-               array(getUserId()), __FILE__, __LINE__);
+               array(getMemberId()), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
        // Please confirm these mails!
-       $sum = 0; $OUT = ''; $SW = 2;
+       $sum = '0'; $OUT = ''; $SW = 2;
 
        // Init content
        $content = array();
@@ -146,8 +144,8 @@ if (SQL_NUMROWS($result) > 0) {
                // Load data from stats table...
                $cat = '';
                $result_data = false;
-               $PROBLEM = '';
-               $DATA = $content;
+               $PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+               $DATA = $id . '/' . $id2 . '/' . $type;
                switch ($type) {
                        case 'NORMAL':
                                $result_data = SQL_QUERY_ESC("SELECT
@@ -197,7 +195,7 @@ LIMIT 1",
                                $sender = bigintval($sender);
                        } elseif ($type == 'bonusid') {
                                // Is admin
-                               $sender = getMessage('_ADMIN_SHORT');
+                               $sender = getMessage('USERNAME_ADMIN_SHORT');
                        } else {
                                // Deleted
                                $sender = getMessage('EMAIL_STATUS_DELETED');
@@ -205,15 +203,15 @@ LIMIT 1",
 
                        // Prepare data for template
                        $content = array(
-                               'sw'      => $SW,
-                               'userid'  => getUserId(),
-                               '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