'userid' rewritten to functions

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 87d0ce83ce429dd0c3bfd02411a7788f8397029b..9ebd3a5c3895fbd3297a27811e9a742b7dcc3c2d 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -69,19 +69,19 @@ 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(REQUEST_GET('order')), $GLOBALS['userid']), __FILE__, __LINE__);
+               array($type, bigintval(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
                // Load personal data...
                $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                       array($GLOBALS['userid']), __FILE__, __LINE__);
+                       array(getUserId()), __FILE__, __LINE__);
                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // 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(REQUEST_GET('order')), $GLOBALS['userid']), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
@@ -92,7 +92,7 @@ if (empty($URL)) {
                // Update used points
                $ADD = "";
                if (getConfig('order_max_full') == "ORDER") $ADD = ", mail_orders=mail_orders+1";
-               SUB_POINTS("order", $GLOBALS['userid'], $USED);
+               SUB_POINTS("order", getUserId(), $USED);
 
                // Prepare content
                $content = array(
@@ -105,11 +105,11 @@ if (empty($URL)) {
                );
 
                // Send an email to the user
-               $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, $GLOBALS['userid']);
+               $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, getUserId());
                SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
 
                // Notify admins about this
-               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), "order-admin", $content, $GLOBALS['userid']);
+               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), "order-admin", $content, getUserId());
 
                // Output back bottom
                LOAD_TEMPLATE("member_order-back", false);