X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=8df46153fc3307a7d9aea2c5b4d63e04d9ba9b85;hb=aa838f04c6d825f706e3c7e27e3e1aa8bbd9ebb2;hp=b0c26bc7af42d42487255500bbbe76b3d8e79c84;hpb=ae80e170b5d25a4782af90a7c3d81fbb176fa293;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index b0c26bc7af..8df46153fc 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -33,7 +33,7 @@
 
 // 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())) {
@@ -50,7 +50,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 // When URL is empty nothing bad happend here
 if (empty($URL)) {
 	// Is the auto-send mechanism active or inactive?
-	if ($_CONFIG['autosend_active'] == "Y") {
+	if (getConfig('autosend_active') == "Y") {
 		// Auto-send is active
 		define('ADMIN_AUTOSEND',  COMPILE_CODE(ADMIN_AUTOSEND_ACTIVE));
 		define('MEMBER_AUTOSEND', COMPILE_CODE(MEMBER_AUTOSEND_ACTIVE));
@@ -63,23 +63,20 @@ if (empty($URL)) {
 	}
 
 	// Update sending pool
-	$result = 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($_GET['order']), $GLOBALS['userid']), __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($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Finally is the entry valid?
-	if (SQL_AFFECTEDROWS($link) == 1) {
-		// Update his login data
-		UPDATE_LOGIN_DATA();
-
+	if (SQL_AFFECTEDROWS() == 1) {
 		// Load personal data...
-		$result = SQL_QUERY_ESC("SELECT sex, 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);
+		$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($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
 		SQL_FREERESULT($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($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
+			array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 		$DATA = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 		if (empty($DATA[0])) $DATA[0] = DEFAULT_SUBJECT_LINE;
@@ -89,28 +86,31 @@ if (empty($URL)) {
 
 		// Update used points
 		$ADD = "";
-		if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
-		SUB_POINTS($GLOBALS['userid'], $USED);
+		if (getConfig('order_max_full') == "ORDER") $ADD = ", mail_orders=mail_orders+1";
+		SUB_POINTS("order", $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'   => getConfig('max_send'),
+			'subject'  => $DATA[0],
+			'text'     => $DATA[1],
+			'payment'  => GET_PAYMENT($DATA[3]),
+			'category' => GET_CATEGORY($DATA[6]),
+			'url'      => $DATA[5]
+		);
 
 		// 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);
 	} else {
 		// Matching line not found or already "placed" in send queue
-		$URL = URL."/modules.php?module=login";
-		LOAD_URL($URL);
+		LOAD_URL(URL."/modules.php?module=login");
 	}
 } else {
 	// Redirect...