More fixes for ext-surfbar:

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index c9c4ae5458377f951180351e53f924645d0daf79..c491d0798318e46419fc67bebf4fd6e9ad05b8a0 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -40,7 +40,7 @@ $url = '';
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!
@@ -83,15 +83,19 @@ if (empty($url)) {
                SQL_FREERESULT($result);
 
                // Fix empty subject line
-               if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+               if (empty($content['subject'])) {
+                       $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+               } // END - if
 
                // Calculate used points
-               $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               subtractPoints('order', getMemberId(), $content['payed_points']);
 
                // Update used points
                $add = '';
-               if (getConfig('order_max_full') == 'ORDER') $add = ', `mail_orders`=`mail_orders`+1';
-               subtractPoints('order', getMemberId(), $usedPoints);
+               if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+                       $add = ', `mail_orders`=`mail_orders`+1';
+               } // END - if
 
                // Send an email to the user
                $message_mem = loadEmailTemplate('member_order_normal', $content, getMemberId());
@@ -103,7 +107,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,