X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=fda6bbc7d1612270e661fd8949c485dc1879d19a;hp=fa9e4473ced2e4b18b29782debe2c1a91f132c15;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/modules/order.php b/inc/modules/order.php
index fa9e4473ce..fda6bbc7d1 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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 *
@@ -37,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-$URL = '';
+$url = '';
 if (!defined('__SECURITY')) {
 	die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
@@ -45,40 +44,46 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isMember()) {
 	// Sorry, no guest access!
-	$URL = 'modules.php?module=index';
-} elseif (!isGetRequestElementSet('order')) {
+	$url = 'modules.php?module=index';
+} elseif (!isGetRequestParameterSet('order')) {
 	// You cannot call this module directly!
-	$URL = 'modules.php?module=login&what=order';
+	$url = 'modules.php?module=login&what=order';
 }
 
 // When URL is empty nothing bad happend here
-if (empty($URL)) {
+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",
-		array($type, bigintval(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
+		array($type, bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
 	// Finally is the entry valid?
-	if (SQL_AFFECTEDROWS() == 1) {
+	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__);
+			array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+
+		// Merge arrays
 		$content = merge_array($content, SQL_FETCHARRAY($result));
+
+		// Free result
 		SQL_FREERESULT($result);
-		if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+
+		// Fix empty subject line
+		if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
 		// Calculate used points
 		$usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
@@ -88,18 +93,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>',
@@ -117,7 +118,7 @@ if (empty($URL)) {
 	}
 } else {
 	// Redirect...
-	redirectToUrl($URL);
+	redirectToUrl($url);
 }
 
 // [EOF]