X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Forder.php;h=0e0fb4341d77e20deef9288d97a8f94425ddfaea;hb=be98d2d73da776ab3ec1c60e0f1f8db69716f327;hp=d26647bff32841bc7670dcb4f6053d50a268d982;hpb=371c76216421ea999a58fde5be37a350aaf18f78;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index d26647bff3..0e0fb4341d 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                                        *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,7 +47,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,16 +69,22 @@ 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__);
+			array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+
+		// Merge arrays
 		$content = merge_array($content, SQL_FETCHARRAY($result));
+
+		// Free result
 		SQL_FREERESULT($result);
+
+		// Fix empty subject line
 		if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
 		// Calculate used points
@@ -86,25 +93,25 @@ 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['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, getUserId()).'</pre>',
+			'<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',
 			'MEMBER_ORDER',
-			getUserId(),
+			getMemberId(),
 			0,
 			false
 		);