'userid' rewritten to functions

[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 4586eccadbc1ee86e4256bd08db16f4d5022d054..9616b698b04f37cabcc54956d1086bd47e8d4357 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -69,7 +69,7 @@ WHERE id=%s LIMIT 1",
        $content['is_notify'] = TRANSLATE_YESNO($content['is_notify']);
        $content['sender']    = _ADMIN_SHORT;
        $content['time']      = CREATE_FANCY_TIME($content['time']);
        $content['is_notify'] = TRANSLATE_YESNO($content['is_notify']);
        $content['sender']    = _ADMIN_SHORT;
        $content['time']      = CREATE_FANCY_TIME($content['time']);

-       $content['uid']       = $GLOBALS['userid'];
+       $content['uid']       = getUserId();

 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),


@@ -102,7 +102,7 @@ WHERE s.id=%s LIMIT 1",
        $content['category']  = GET_CATEGORY($content['cat_id']);
        $content['points']    = TRANSLATE_COMMA($content['points']);
        $content['time']      = CREATE_FANCY_TIME($content['time']);
        $content['category']  = GET_CATEGORY($content['cat_id']);
        $content['points']    = TRANSLATE_COMMA($content['points']);
        $content['time']      = CREATE_FANCY_TIME($content['time']);

-       $content['uid']       = $GLOBALS['userid'];
+       $content['uid']       = getUserId();

 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),


@@ -119,11 +119,11 @@ WHERE s.id=%s LIMIT 1",
 if (EXT_IS_ACTIVE("bonus")) {
        // 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",
 if (EXT_IS_ACTIVE("bonus")) {
        // 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($GLOBALS['userid']), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);

 } else {
        // 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",
 } else {
        // 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($GLOBALS['userid']), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);

 }
 
 // Mails left for confirmation?
 }
 
 // Mails left for confirmation?


@@ -188,7 +188,7 @@ LIMIT 1",
                        // Prepare data for template
                        $content = array(
                                'sw'      => $SW,
                        // Prepare data for template
                        $content = array(
                                'sw'      => $SW,

-                               'uid'     => $GLOBALS['userid'],
+                               'uid'     => getUserId(),

                                'data'    => bigintval($DATA),
                                'type'    => $type,
                                'subject' => $subject,
                                'data'    => bigintval($DATA),
                                'type'    => $type,
                                'subject' => $subject,