X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=fda6bbc7d1612270e661fd8949c485dc1879d19a;hp=24b51118d277b075fa7ef272d7c1a56e798ccb09;hb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 24b51118d2..fda6bbc7d1 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                                        *
@@ -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 - 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 *
@@ -37,90 +36,90 @@
  ************************************************************************/
 
 // Some security stuff...
-$URL = '';
+$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__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), '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'))) {
+	$url = 'modules.php?module=index';
+} elseif (!isGetRequestParameterSet('order')) {
 	// You cannot call this module directly!
-	$URL = 'modules.php?module=login&amp;what=order';
+	$url = 'modules.php?module=login&amp;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
-		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_ACTIVE'));
-		define('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
-		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_INACTIVE'));
-		define('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(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) {
-		// Load personal data...
-		$result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-			array(getUserId()), __FILE__, __LINE__);
-		list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+	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__);
+
+		// Merge arrays
+		$content = merge_array($content, SQL_FETCHARRAY($result));
 
-		// 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__);
-		$DATA = SQL_FETCHROW($result);
+		// Free result
 		SQL_FREERESULT($result);
-		if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
+
+		// Fix empty subject line
+		if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
 		// Calculate used points
-		$USED = $DATA[7] * GET_PAY_POINTS($DATA[3]);
+		$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);
-
-		// Prepare content
-		$content = array(
-			'blocks'   => getConfig('max_send'),
-			'subject'  => $DATA[0],
-			'text'     => $DATA[1],
-			'payment'  => GET_PAYMENT($DATA[3]),
-			'category' => GET_CATEGORY($DATA[6]),
-			'url'      => $DATA[5]
-		);
+		subtractPoints('order', getMemberId(), $usedPoints);
 
 		// Send an email to the user
-		$msg_mem = LOAD_EMAIL_TEMPLATE('order-member', $content, getUserId());
-		SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
+		$message_mem = loadEmailTemplate('order-member', $content, getMemberId());
+		sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
 		// Notify admins about this
-		SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
+		sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
+
+		// Create new task (we ignore the task id here)
+		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
-		LOAD_URL('modules.php?module=login');
+		redirectToUrl('modules.php?module=login');
 	}
 } else {
 	// Redirect...
-	LOAD_URL($URL);
+	redirectToUrl($url);
 }
 
-//
+// [EOF]
 ?>