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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 5dcc041bde..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                                        *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -39,15 +40,14 @@
 // Some security stuff...
 $URL = '';
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
+	die();
+} elseif ((!isExtensionActive('order')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
 	return;
-} elseif (!IS_MEMBER()) {
+} elseif (!isMember()) {
 	// Sorry, no guest access!
 	$URL = 'modules.php?module=index';
-} elseif (!REQUEST_ISSET_GET('order')) {
+} elseif (!isGetRequestParameterSet('order')) {
 	// You cannot call this module directly!
 	$URL = 'modules.php?module=login&amp;what=order';
 }
@@ -57,52 +57,67 @@ if (empty($URL)) {
 	// Is the auto-send mechanism active or inactive?
 	if (getConfig('autosend_active') == 'Y') {
 		// Auto-send is active
-		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_ACTIVE'));
-		define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_ACTIVE'));
+		$content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_ACTIVE');
+		$content['member_autosend'] = getMessage('MEMBER_AUTOSEND_ACTIVE');
 		$type = 'NEW';
 	} else {
 		// Auto-send is inactive
-		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_INACTIVE'));
-		define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_INACTIVE'));
+		$content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_INACTIVE');
+		$content['member_autosend'] = getMessage('MEMBER_AUTOSEND_INACTIVE');
 		$type = 'ADMIN';
 	}
 
 	// 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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
+	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__);
 
 	// 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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
-		$content = SQL_FETCHARRAY($result);
+		$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__);
+
+		// 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
-		$USED = $content['target_send'] * getPaymentPoints($content['payment_id']);
+		$usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
 
 		// Update used points
 		$add = '';
 		if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
-		SUB_POINTS('order', getUserId(), $USED);
+		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 = LOAD_EMAIL_TEMPLATE('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
-		LOAD_TEMPLATE('member_order-back', false);
+		loadTemplate('member_order-back');
 	} else {
 		// Matching line not found or already 'placed' in send queue
 		redirectToUrl('modules.php?module=login');