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 338a6530b692843c21bc028b2f2c3565dba32c32..469590e29407d473973b2fdf5f35ff80b58e6151 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -54,18 +54,18 @@ if (!defined('__SECURITY')) {
 
 // When URL is empty nothing bad happend here
 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']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
                $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
                $type = 'NEW';
-       } else {
-               // Auto-send is inactive
-               $content['admin_autosend']  = '{--ADMIN_AUTOSEND_INACTIVE--}';
-               $content['member_autosend'] = '{--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",
@@ -95,16 +95,12 @@ 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(), '{--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 (we ignore the task id here)
                createNewTask(