www is out-dated

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index c12566fa877ae9101364fb8b5746e423ba80e317..3539445643ac837243012ccc5eba67522f441016 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -40,12 +40,12 @@ $url = '';
 if (!defined('__SECURITY')) {
        die();
 } 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,14 @@ 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));
@@ -89,6 +89,8 @@ if (empty($url)) {
 
                // Calculate used points
                $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+
+               // Subtract them from the user's account and ignore return status
                subtractPoints('order', getMemberId(), $content['payed_points']);
 
                // Update used points
@@ -107,7 +109,7 @@ if (empty($url)) {
                // Create new task (we ignore the task id here)
                createNewTask(
                        '{--ADMIN_NEW_QUEUE--}',
-                       '<pre>'.loadEmailTemplate('admin_order_normal', $content, getMemberId()).'</pre>',
+                       '<pre>' . loadEmailTemplate('admin_order_normal', $content, getMemberId()) . '</pre>',
                        'MEMBER_ORDER',
                        getMemberId(),
                        0,