X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Forder.php;h=469590e29407d473973b2fdf5f35ff80b58e6151;hb=449003a0cf1cf2434ef63e4b7d39685ba3804786;hp=fc162145d81528195293f1d517d600a3cacda5da;hpb=0fe94791af05018868398d3c6c87d2b16f9557a2;p=mailer.git diff --git a/inc/modules/order.php b/inc/modules/order.php index fc162145d8..469590e294 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * 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,7 +38,7 @@ ************************************************************************/ // Some security stuff... -$URL = ''; +$url = ''; if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('order')) && (!isAdmin())) { @@ -45,26 +46,26 @@ if (!defined('__SECURITY')) { return; } elseif (!isMember()) { // Sorry, no guest access! - $URL = 'modules.php?module=index'; + $url = 'modules.php?module=index'; } elseif (!isGetRequestParameterSet('order')) { // You cannot call this module directly! - $URL = 'modules.php?module=login&what=order'; + $url = 'modules.php?module=login&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 - $content['admin_autosend'] = getMessage('ADMIN_AUTOSEND_ACTIVE'); - $content['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 - $content['admin_autosend'] = getMessage('ADMIN_AUTOSEND_INACTIVE'); - $content['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", @@ -76,9 +77,15 @@ if (empty($URL)) { // 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)); + + // Free result SQL_FREERESULT($result); - if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE'); + + // Fix empty subject line + if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}'; // Calculate used points $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']); @@ -88,18 +95,14 @@ if (empty($URL)) { if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1'; subtractPoints('order', getMemberId(), $usedPoints); - // Compile content - $content['payment'] = getPaymentTitlePrice($content['payment_id']); - $content['category'] = getCategory($content['cat_id']); - // Send an email to the user $message_mem = loadEmailTemplate('order-member', $content, getMemberId()); - sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem); + sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem); // Notify admins about this - sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId()); + sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId()); - // Create new task + // Create new task (we ignore the task id here) createNewTask( '{--ADMIN_NEW_QUEUE--}', '
'.loadEmailTemplate('order-admin', $content, getMemberId()).'', @@ -117,7 +120,7 @@ if (empty($URL)) { } } else { // Redirect... - redirectToUrl($URL); + redirectToUrl($url); } // [EOF]