X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=915500d4d7aba0bf78abef0429f65ad1d269ac77;hp=ac4023556fa790d87dc1038544882cbcbcddb376;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/modules/order.php b/inc/modules/order.php
index ac4023556f..915500d4d7 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,14 +38,14 @@
 // Some security stuff...
 $url = '';
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
 	return;
 } elseif (!isMember()) {
 	// Sorry, no guest access!
 	$url = 'modules.php?module=index';
-} elseif (!isGetRequestParameterSet('order')) {
+} elseif (!isGetRequestElementSet('order')) {
 	// You cannot call this module directly!
 	$url = 'modules.php?module=login&what=order';
 }
@@ -67,14 +67,21 @@ if (empty($url)) {
 
 	// 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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+		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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+		$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));
@@ -83,27 +90,33 @@ 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'] * getPaymentData($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 (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('order-member', $content, getMemberId());
+		$message_mem = loadEmailTemplate('member_order_normal', $content, getMemberId());
 		sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
 		// Notify admins about this
-		sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
+		sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'admin_order_normal', $content, getMemberId());
 
 		// Create new task (we ignore the task id here)
 		createNewTask(
 			'{--ADMIN_NEW_QUEUE--}',
-			'<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
+			'<pre>' . loadEmailTemplate('admin_order_normal', $content, getMemberId()) . '</pre>',
 			'MEMBER_ORDER',
 			getMemberId(),
 			0,
@@ -111,7 +124,7 @@ if (empty($url)) {
 		);
 
 		// Output back bottom
-		loadTemplate('member_order-back');
+		loadTemplate('member_order_thanks');
 	} else {
 		// Matching line not found or already 'placed' in send queue
 		redirectToUrl('modules.php?module=login');