Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index e47f21b2c784a0e40c0a4ed9d6f15cc7d1f8862f..bf0a4dd76089feba3d2778b33f0bd844feeabfa6 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -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