X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=fc162145d81528195293f1d517d600a3cacda5da;hb=b38e97d5419a80763653dc2cd61f0c418f2a8177;hp=6fca97ea81416b9ec68112df594fb375f5f30a70;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 6fca97ea81..fc162145d8 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/29/2003 *
- * ===============                              Last change: 01/06/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 10/29/2003 *
+ * ===================                          Last change: 01/06/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : order.php                                        *
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 } elseif (!isMember()) {
 	// Sorry, no guest access!
 	$URL = 'modules.php?module=index';
-} elseif (!isGetRequestElementSet('order')) {
+} elseif (!isGetRequestParameterSet('order')) {
 	// You cannot call this module directly!
 	$URL = 'modules.php?module=login&amp;what=order';
 }
@@ -68,14 +68,14 @@ 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(getRequestElement('order')), getUserId()), __FILE__, __LINE__);
+		array($type, bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
 	// Finally is the entry valid?
 	if (SQL_AFFECTEDROWS() == 1) {
 		// @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')), getUserId()), __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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 		$content = merge_array($content, SQL_FETCHARRAY($result));
 		SQL_FREERESULT($result);
 		if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
@@ -86,22 +86,31 @@ if (empty($URL)) {
 		// Update used points
 		$add = '';
 		if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
-		subtractPoints('order', getUserId(), $usedPoints);
+		subtractPoints('order', getMemberId(), $usedPoints);
 
 		// Compile content
-		$content['block']    = getConfig('max_send');
 		$content['payment']  = getPaymentTitlePrice($content['payment_id']);
 		$content['category'] = getCategory($content['cat_id']);
 
 		// Send an email to the user
-		$message_mem = loadEmailTemplate('order-member', $content, getUserId());
-		sendEmail(getUserId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+		$message_mem = loadEmailTemplate('order-member', $content, getMemberId());
+		sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
 
 		// Notify admins about this
-		sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
+		sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
+
+		// Create new task
+		createNewTask(
+			'{--ADMIN_NEW_QUEUE--}',
+			'<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
+			'MEMBER_ORDER',
+			getMemberId(),
+			0,
+			false
+		);
 
 		// Output back bottom
-		loadTemplate('member_order-back', false);
+		loadTemplate('member_order-back');
 	} else {
 		// Matching line not found or already 'placed' in send queue
 		redirectToUrl('modules.php?module=login');