More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 01ec35f27244911f07e20e3ef868abcf071f2b01..5dcc041bdedd028d3198b42a855a52d542630e1f 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
        $URL = 'modules.php?module=index';
-} elseif (!REQUEST_ISSET_GET(('order'))) {
+} elseif (!REQUEST_ISSET_GET('order')) {
        // You cannot call this module directly!
        $URL = 'modules.php?module=login&what=order';
 }
@@ -68,45 +68,35 @@ 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')), getUserId()), __FILE__, __LINE__);
+       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?
        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(getUserId()), __FILE__, __LINE__);
-               list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
+               // @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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($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')), getUserId()), __FILE__, __LINE__);
-               $DATA = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
-               if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
+               if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
                // Calculate used points
-               $USED = $DATA[7] * getPaymentPoints($DATA[3]);
+               $USED = $content['target_send'] * getPaymentPoints($content['payment_id']);
 
                // Update used points
                $add = '';
                if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
                SUB_POINTS('order', getUserId(), $USED);
 
-               // Prepare content
-               $content = array(
-                       'blocks'   => getConfig('max_send'),
-                       'subject'  => $DATA[0],
-                       'text'     => $DATA[1],
-                       'payment'  => getPaymentTitlePrice($DATA[3]),
-                       'category' => getCategory($DATA[6]),
-                       'url'      => $DATA[5]
-               );
+               // Compile content
+               $content['block']    = getConfig('max_send');
+               $content['payment']  = getPaymentTitlePrice($content['payment_id']);
+               $content['category'] = getCategory($content['cat_id']);
 
                // Send an email to the user
-               $msg_mem = LOAD_EMAIL_TEMPLATE('order-member', $content, getUserId());
-               sendEmail($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
+               $message_mem = LOAD_EMAIL_TEMPLATE('order-member', $content, getUserId());
+               sendEmail(getUserId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
 
                // Notify admins about this
                sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
@@ -122,5 +112,5 @@ if (empty($URL)) {
        redirectToUrl($URL);
 }
 
-//
+// [EOF]
 ?>