X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=93f5e2a005529f9563dbdca98bad1c009c9a6bb5;hb=6b1e55213d76a67e9aa3d9f1e4dcb55e0bbf12ee;hp=484ba98daff96555d28ba2feef79bbd101586848;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 484ba98daf..93f5e2a005 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -58,51 +58,33 @@ if (empty($url)) {
 	$type = 'ADMIN';
 
 	// Is the auto-send mechanism active or inactive?
-	if (getConfig('autosend_active') == 'Y') {
+	if (isAutosendMemberMailsEnabled()) {
 		// Auto-send is active
 		$content['admin_autosend']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
 		$content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
 		$type = 'NEW';
 	} // 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",
-		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(getRequestElement('order')),
-				getMemberId()
-			), __FILE__, __LINE__);
-
-		// Merge arrays
-		$content = merge_array($content, SQL_FETCHARRAY($result));
-
-		// Free result
-		SQL_FREERESULT($result);
+	// Update pool data and check if the entry is valid
+	if (!updatePoolDataById(getRequestElement('order'), 'data_type', $type, NULL, sprintf(" AND `sender`=%s AND `data_type`='TEMP'", getMemberId()))) {
+		// Merge array with pool data
+		// @TODO Unused: timestamp
+		$content = merge_array($content, getPoolDataFromId(getRequestElement('order')));
 
 		// Fix empty subject line
 		if (empty($content['subject'])) {
-			$content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+			$content['subject'] = '{--DEFAULT_SUBJECT--}';
 		} // END - if
 
 		// Calculate used points
-		$content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+		$content['payed_points'] = $content['target_send'] * getPaymentPrice($content['payment_id']);
 
 		// Subtract them from the user's account and ignore return status
 		subtractPoints('order', getMemberId(), $content['payed_points']);
 
 		// Update used points
 		$add = '';
-		if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+		if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getOrderMaxFull() == 'ORDER')) {
 			$add = ',`mail_orders`=`mail_orders`+1';
 		} // END - if