X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Forder.php;h=071e4db443b648bc74db94c3c5e6bd83d0a5cdcf;hb=c8baf7e02feebf07460dc85da2ffa1c58b1f9caf;hp=e70a2b03f15e02aadcdfc3e05186b239111b4b86;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;p=mailer.git
diff --git a/inc/modules/order.php b/inc/modules/order.php
index e70a2b03f1..071e4db443 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * 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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -42,41 +40,48 @@ $url = '';
if (!defined('__SECURITY')) {
die();
} elseif ((!isExtensionActive('order')) && (!isAdmin())) {
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+ displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
return;
} elseif (!isMember()) {
// Sorry, no guest access!
$url = 'modules.php?module=index';
-} elseif (!isGetRequestParameterSet('order')) {
+} elseif (!isGetRequestElementSet('order')) {
// You cannot call this module directly!
$url = 'modules.php?module=login&what=order';
}
// When URL is empty nothing bad happend here
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",
- array($type, bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+ array(
+ $type,
+ bigintval(getRequestElement('order')),
+ getMemberId()
+ ), __FILE__, __LINE__);
// Finally is the entry valid?
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
// @TODO Unused: 2,4
// 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__);
+ $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(getRequestElement('order')),
+ getMemberId()
+ ), __FILE__, __LINE__);
// Merge arrays
$content = merge_array($content, SQL_FETCHARRAY($result));
@@ -85,31 +90,33 @@ if (empty($url)) {
SQL_FREERESULT($result);
// Fix empty subject line
- if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+ if (empty($content['subject'])) {
+ $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+ } // END - if
// Calculate used points
- $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
+ $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+
+ // Subtract them from the user's account and ignore return status
+ subtractPoints('order', getMemberId(), $content['payed_points']);
// Update used points
$add = '';
- 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']);
+ if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+ $add = ', `mail_orders`=`mail_orders`+1';
+ } // END - if
// Send an email to the user
- $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
- sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+ $message_mem = loadEmailTemplate('member_order_normal', $content, getMemberId());
+ sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
// Notify admins about this
- sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
+ sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'admin_order_normal', $content, getMemberId());
- // Create new task
+ // Create new task (we ignore the task id here)
createNewTask(
'{--ADMIN_NEW_QUEUE--}',
- ''.loadEmailTemplate('order-admin', $content, getMemberId()).'',
+ '' . loadEmailTemplate('admin_order_normal', $content, getMemberId()) . '',
'MEMBER_ORDER',
getMemberId(),
0,