X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=c0164a51d7994d392cf4f23eb2d476871e61d70f;hb=254afbdb1fa4699a98667bad4e792ad803a0d535;hp=01f89fabcf6f78d499081c5d6b4fed11070d501f;hpb=ad1871ab43f3e127a6f1cce5c5d34c7baeace1aa;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 01f89fabcf..c0164a51d7 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -33,13 +33,13 @@
 
 // Some security stuff...
 $URL = "";
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
 	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
 	return;
-} elseif (!IS_LOGGED_IN()) {
+} elseif (!IS_MEMBER()) {
 	// Sorry, no guest access!
 	$URL = URL."/modules.php?module=index";
 } elseif (empty($_GET['order'])) {
@@ -67,14 +67,14 @@ if (empty($URL)) {
 	 array($type, bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Finally is the entry valid?
-	if (SQL_AFFECTEDROWS($link) == 1) {
+	if (SQL_AFFECTEDROWS() == 1) {
 		// Update his login data
 		UPDATE_LOGIN_DATA();
 
 		// Load personal data...
-		$result = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 		 array($GLOBALS['userid']), __FILE__, __LINE__);
-		list($sex, $sname, $fname, $email) = SQL_FETCHROW($result);
+		list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		// Load mail again...              0       1        2           3          4      5      6         7
@@ -92,18 +92,21 @@ if (empty($URL)) {
 		if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
 		SUB_POINTS($GLOBALS['userid'], $USED);
 
-		// Update mediadata as well
-		if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
-			// Update database
-			MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $USED);
-		}
+		// Prepare content
+		$content = array(
+			'blocks'   => $_CONFIG['max_send'],
+			'subject'  => $DATA[0],
+			'text'     => $DATA[1],
+			'payment'  => GET_PAYMENT($DATA[3]),
+			'category' => GET_CATEGORY($DATA[6])
+		);
 
 		// Send an email to the user
-		$msg_mem = LOAD_EMAIL_TEMPLATE("order-member", "", $GLOBALS['userid']);
+		$msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, $GLOBALS['userid']);
 		SEND_EMAIL($email, MEMBER_NEW_QUEUE, $msg_mem);
 
 		// Notify admins about this
-		SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", "", $GLOBALS['userid']);
+		SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", $content, $GLOBALS['userid']);
 
 		// Output back bottom
 		LOAD_TEMPLATE("member_order-back", false);