New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 24b51118d277b075fa7ef272d7c1a56e798ccb09..c4db5c2f9fd28de59b1dead685d6a483c22ebed1 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -68,7 +68,7 @@ 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",
+       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')), getUserId()), __FILE__, __LINE__);
 
        // Finally is the entry valid?
@@ -80,14 +80,14 @@ if (empty($URL)) {
                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",
+               $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')), getUserId()), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
 
                // Calculate used points
-               $USED = $DATA[7] * GET_PAY_POINTS($DATA[3]);
+               $USED = $DATA[7] * getPaymentPoints($DATA[3]);
 
                // Update used points
                $add = '';
@@ -99,27 +99,27 @@ if (empty($URL)) {
                        'blocks'   => getConfig('max_send'),
                        'subject'  => $DATA[0],
                        'text'     => $DATA[1],
-                       'payment'  => GET_PAYMENT($DATA[3]),
-                       'category' => GET_CATEGORY($DATA[6]),
+                       'payment'  => getPaymentTitlePrice($DATA[3]),
+                       'category' => getCategory($DATA[6]),
                        'url'      => $DATA[5]
                );
 
                // Send an email to the user
                $msg_mem = LOAD_EMAIL_TEMPLATE('order-member', $content, getUserId());
-               SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
+               sendEmail($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
 
                // Notify admins about this
-               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
+               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
 
                // Output back bottom
                LOAD_TEMPLATE('member_order-back', false);
        } else {
                // Matching line not found or already 'placed' in send queue
-               LOAD_URL('modules.php?module=login');
+               redirectToUrl('modules.php?module=login');
        }
 } else {
        // Redirect...
-       LOAD_URL($URL);
+       redirectToUrl($URL);
 }
 
 //