Fix for fix... :(

[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..1e7e55cb04c0128f5dc38bfbe0640803bde2916f 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -68,9 +68,9 @@ 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'),
@@ -109,7 +109,7 @@ 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'),
@@ -124,13 +124,13 @@ 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?
@@ -146,8 +146,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 +197,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');
@@ -206,7 +206,7 @@ LIMIT 1",
                        // Prepare data for template
                        $content = array(
                                'sw'      => $SW,
-                               'userid'  => getUserId(),
+                               'userid'  => getMemberId(),
                                'data'    => bigintval($DATA),
                                'type'    => $type,
                                'subject' => $subject,