X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=f801044c5c01353075f5123b2142dcedf8816050;hb=0226aea588ae0b433e4c2c17b23f79885c2d0da5;hp=399efd48a4b02d983949944eaac1aaddbea29a69;hpb=747c49b9f46a3d7d1d881c9e1c273ecf107f8d8b;p=mailer.git

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 399efd48a4..f801044c5c 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -37,7 +37,7 @@ 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(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "order");
 	return;
 } elseif (!IS_MEMBER()) {
 	// Sorry, no guest access!
@@ -52,34 +52,34 @@ if (empty($URL)) {
 	// Is the auto-send mechanism active or inactive?
 	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));
+		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_ACTIVE'));
+		define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_ACTIVE'));
 		$type = "NEW";
 	} else {
 		// Auto-send is inactive
-		define('ADMIN_AUTOSEND',  COMPILE_CODE(ADMIN_AUTOSEND_INACTIVE));
-		define('MEMBER_AUTOSEND', COMPILE_CODE(MEMBER_AUTOSEND_INACTIVE));
+		define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_INACTIVE'));
+		define('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",
+	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() == 1) {
 		// Load personal data...
-		$result = SQL_QUERY_ESC("SELECT gender, 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($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",
+		$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__);
 		$DATA = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		if (empty($DATA[0])) $DATA[0] = DEFAULT_SUBJECT_LINE;
+		if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
 
 		// Calculate used points
 		$USED = $DATA[7] * GET_PAY_POINTS($DATA[3]);
@@ -101,10 +101,10 @@ if (empty($URL)) {
 
 		// Send an email to the user
 		$msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, $GLOBALS['userid']);
-		SEND_EMAIL($email, MEMBER_NEW_QUEUE, $msg_mem);
+		SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
 
 		// Notify admins about this
-		SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", $content, $GLOBALS['userid']);
+		SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), "order-admin", $content, $GLOBALS['userid']);
 
 		// Output back bottom
 		LOAD_TEMPLATE("member_order-back", false);
@@ -116,5 +116,6 @@ if (empty($URL)) {
 	// Redirect...
 	LOAD_URL($URL);
 }
+
 //
 ?>