Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index e47f21b2c784a0e40c0a4ed9d6f15cc7d1f8862f..915500d4d7aba0bf78abef0429f65ad1d269ac77 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,14 +38,14 @@
 // Some security stuff...
 $url = '';
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!
        $url = 'modules.php?module=index';
-} elseif (!isGetRequestParameterSet('order')) {
+} elseif (!isGetRequestElementSet('order')) {
        // You cannot call this module directly!
        $url = 'modules.php?module=login&what=order';
 }
@@ -67,14 +67,21 @@ 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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+               array(
+                       $type,
+                       bigintval(getRequestElement('order')),
+                       getMemberId()
+               ), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (!SQL_HASZEROAFFECTED()) {
                // @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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+               $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')),
+                               getMemberId()
+                       ), __FILE__, __LINE__);
 
                // Merge arrays
                $content = merge_array($content, SQL_FETCHARRAY($result));
@@ -88,13 +95,15 @@ if (empty($url)) {
                } // END - if
 
                // Calculate used points
-               $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               $content['payed_points'] = $content['target_send'] * getPaymentData($content['payment_id']);
+
+               // Subtract them from the user's account and ignore return status
                subtractPoints('order', getMemberId(), $content['payed_points']);
 
                // Update used points
                $add = '';
                if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
-                       $add = ', `mail_orders`=`mail_orders`+1';
+                       $add = ',`mail_orders`=`mail_orders`+1';
                } // END - if
 
                // Send an email to the user
@@ -115,7 +124,7 @@ if (empty($url)) {
                );
 
                // Output back bottom
-               loadTemplate('member_order-back');
+               loadTemplate('member_order_thanks');
        } else {
                // Matching line not found or already 'placed' in send queue
                redirectToUrl('modules.php?module=login');