X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=469590e29407d473973b2fdf5f35ff80b58e6151;hb=1039f5eafd5f3db808b432ba246bd3d75f3030ec;hp=e70a2b03f15e02aadcdfc3e05186b239111b4b86;hpb=1cbf289d059637cb2707b0f5384637f081ad6402;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index e70a2b03f1..469590e294 100644
--- 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']  = 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>',