Added more config wrappers

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index d2a67e94c5cc4abb7bda2b7ded859f7734c1ee0e..68509930dbf9633d25a8fa1653d185468dc545da 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -38,7 +38,7 @@
 // Some security stuff...
 $url = '';
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
@@ -77,7 +77,7 @@ if (empty($url)) {
        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",
+               $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()
@@ -91,11 +91,11 @@ if (empty($url)) {
 
                // Fix empty subject line
                if (empty($content['subject'])) {
-                       $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+                       $content['subject'] = '{--DEFAULT_SUBJECT--}';
                } // 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']);
@@ -124,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');