X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=0b3a5a4f7df1c6d9eb930abb1b00857acc1146f5;hb=a0c37ca650d27d0aed672ebf34e1be4601a2e0e9;hp=110ae78277d5a58fc88274bef3e4fea59fb67c26;hpb=51d65692668408a44920ce069a37c5fa4f5ba257;p=mailer.git diff --git a/inc/modules/order.php b/inc/modules/order.php index 110ae78277..0b3a5a4f7d 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -50,7 +50,7 @@ if (!defined('__SECURITY')) { // 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)); @@ -69,7 +69,7 @@ if (empty($URL)) { // 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); @@ -86,16 +86,17 @@ 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); // Prepare content $content = array( - 'blocks' => $_CONFIG['max_send'], + 'blocks' => getConfig('max_send'), 'subject' => $DATA[0], 'text' => $DATA[1], 'payment' => GET_PAYMENT($DATA[3]), - 'category' => GET_CATEGORY($DATA[6]) + 'category' => GET_CATEGORY($DATA[6]), + 'url' => $DATA[5] ); // Send an email to the user @@ -109,8 +110,7 @@ if (empty($URL)) { 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...