Naming inconsistencies for userid fixed

[mailer.git] / inc / modules / order.php

diff --git a/inc/modules/order.php b/inc/modules/order.php
index d26647bff32841bc7670dcb4f6053d50a268d982..35ddce0afe6d5c313082042e8fbf751add33883a 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -68,14 +68,14 @@ if (empty($URL)) {
 
        // Update sending pool
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='%s' WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
-               array($type, bigintval(getRequestElement('order')), getUserId()), __FILE__, __LINE__);
+               array($type, bigintval(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
                // @TODO Unused: 2,4
                // Load mail again...              0         1          2             3            4         5       6            7
                $result = SQL_QUERY_ESC("SELECT `subject`, `text`, `receivers`, `payment_id`, `timestamp`, `url`, `cat_id`, `target_send` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s LIMIT 1",
-                       array(bigintval(getRequestElement('order')), getUserId()), __FILE__, __LINE__);
+                       array(bigintval(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
                $content = merge_array($content, SQL_FETCHARRAY($result));
                SQL_FREERESULT($result);
                if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
@@ -86,25 +86,25 @@ if (empty($URL)) {
                // Update used points
                $add = '';
                if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
-               subtractPoints('order', getUserId(), $usedPoints);
+               subtractPoints('order', getMemberId(), $usedPoints);
 
                // Compile content
                $content['payment']  = getPaymentTitlePrice($content['payment_id']);
                $content['category'] = getCategory($content['cat_id']);
 
                // Send an email to the user
-               $message_mem = loadEmailTemplate('order-member', $content, getUserId());
-               sendEmail(getUserId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+               $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
+               sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
 
                // Notify admins about this
-               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
+               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
 
                // Create new task
                createNewTask(
                        '{--ADMIN_NEW_QUEUE--}',
-                       '<pre>'.loadEmailTemplate('order-admin', $content, getUserId()).'</pre>',
+                       '<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
                        'MEMBER_ORDER',
-                       getUserId(),
+                       getMemberId(),
                        0,
                        false
                );