New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 0e0fb4341d77e20deef9288d97a8f94425ddfaea..469590e29407d473973b2fdf5f35ff80b58e6151 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -38,7 +38,7 @@
  ************************************************************************/
 
 // Some security stuff...
-$URL = '';
+$url = '';
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
@@ -46,26 +46,26 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!
-       $URL = 'modules.php?module=index';
+       $url = 'modules.php?module=index';
 } elseif (!isGetRequestParameterSet('order')) {
        // You cannot call this module directly!
-       $URL = 'modules.php?module=login&what=order';
+       $url = 'modules.php?module=login&what=order';
 }
 
 // When URL is empty nothing bad happend here
-if (empty($URL)) {
+if (empty($url)) {
+       // Auto-send is inactive
+       $content['admin_autosend']  = '{--ADMIN_AUTOSEND_INACTIVE--}';
+       $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}';
+       $type = 'ADMIN';
+
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == 'Y') {
                // Auto-send is active
-               $content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_ACTIVE');
-               $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_ACTIVE');
+               $content['admin_autosend']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
+               $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
                $type = 'NEW';
-       } else {
-               // Auto-send is inactive
-               $content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_INACTIVE');
-               $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_INACTIVE');
-               $type = 'ADMIN';
-       }
+       } // END - if
 
        // 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",
@@ -85,7 +85,7 @@ if (empty($URL)) {
                SQL_FREERESULT($result);
 
                // Fix empty subject line
-               if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+               if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
                // Calculate used points
                $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
@@ -95,18 +95,14 @@ if (empty($URL)) {
                if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
                subtractPoints('order', getMemberId(), $usedPoints);
 
-               // Compile content
-               $content['payment']  = getPaymentTitlePrice($content['payment_id']);
-               $content['category'] = getCategory($content['cat_id']);
-
                // Send an email to the user
                $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
-               sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+               sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
                // Notify admins about this
-               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
+               sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
 
-               // Create new task
+               // Create new task (we ignore the task id here)
                createNewTask(
                        '{--ADMIN_NEW_QUEUE--}',
                        '<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
@@ -124,7 +120,7 @@ if (empty($URL)) {
        }
 } else {
        // Redirect...
-       redirectToUrl($URL);
+       redirectToUrl($url);
 }
 
 // [EOF]